This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch fix-key-prefixes
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git
The following commit(s) were added to refs/heads/fix-key-prefixes by this push:
new f540522 adjust key prefixes according to the migration guide
f540522 is described below
commit f540522e1df918d20d5026510fd5daed5bb63fb0
Author: Babak Vahdat <[email protected]>
AuthorDate: Fri May 21 20:52:33 2021 +0200
adjust key prefixes according to the migration guide
---
.../src/main/resources/application.properties | 8 ++++----
master/src/main/resources/application.properties | 6 +++---
rest-jpa/src/test/resources/application.yml | 2 --
.../apache/camel/example/springboot/CamelRouter.java | 2 +-
.../src/main/resources/application.properties | 2 +-
.../apache/camel/example/springboot/CamelRouter.java | 2 +-
.../src/main/resources/application.properties | 2 +-
.../sample/camel/CustomGeneratedConverterLoader.java | 19 ++++++++++++++++++-
.../src/main/resources/application.properties | 6 +++---
9 files changed, 32 insertions(+), 17 deletions(-)
diff --git
a/clustered-route-controller/cluster-node/src/main/resources/application.properties
b/clustered-route-controller/cluster-node/src/main/resources/application.properties
index a96a140..270fc53 100644
---
a/clustered-route-controller/cluster-node/src/main/resources/application.properties
+++
b/clustered-route-controller/cluster-node/src/main/resources/application.properties
@@ -33,7 +33,7 @@ camel.clustered.controller.initial-delay = 5000
# local route that is no clustered
camel.clustered.controller.routes.heartbeat.clustered = false
-camel.component.atomix.cluster.service.enabled = true
-camel.component.atomix.cluster.service.mode = client
-camel.component.atomix.cluster.service.nodes = localhost:8700
-camel.component.atomix.cluster.service.id = ${nodeId}
+camel.cluster.atomix.enabled = true
+camel.cluster.atomix.mode = client
+camel.cluster.atomix.nodes = localhost:8700
+camel.cluster.atomix.id = ${nodeId}
diff --git a/master/src/main/resources/application.properties
b/master/src/main/resources/application.properties
index 92f43e3..8ebfdf4 100644
--- a/master/src/main/resources/application.properties
+++ b/master/src/main/resources/application.properties
@@ -38,6 +38,6 @@ camel.springboot.name = SampleClusteredRouteController
camel.springboot.main-run-controller = true
camel.springboot.jmx-enabled = false
-camel.component.file.cluster.service.enabled = true
-camel.component.file.cluster.service.id = ${node.id}
-camel.component.file.cluster.service.root = ${java.io.tmpdir}
+camel.cluster.file.enabled = true
+camel.cluster.file.id = ${node.id}
+camel.cluster.file.root = ${java.io.tmpdir}
diff --git a/rest-jpa/src/test/resources/application.yml
b/rest-jpa/src/test/resources/application.yml
index f96860a..714fe90 100644
--- a/rest-jpa/src/test/resources/application.yml
+++ b/rest-jpa/src/test/resources/application.yml
@@ -18,8 +18,6 @@
camel:
springboot:
name: CamelRestJpa
- rest:
- component: servlet
servlet:
mapping:
contextPath: /camel-rest-jpa/*
diff --git
a/rest-openapi/src/main/java/org/apache/camel/example/springboot/CamelRouter.java
b/rest-openapi/src/main/java/org/apache/camel/example/springboot/CamelRouter.java
index d139129..1e909c5 100644
---
a/rest-openapi/src/main/java/org/apache/camel/example/springboot/CamelRouter.java
+++
b/rest-openapi/src/main/java/org/apache/camel/example/springboot/CamelRouter.java
@@ -36,7 +36,7 @@ public class CamelRouter extends RouteBuilder {
@Autowired
private Environment env;
- @Value("${camel.component.servlet.mapping.context-path}")
+ @Value("${camel.servlet.mapping.context-path}")
private String contextPath;
@Override
diff --git a/rest-openapi/src/main/resources/application.properties
b/rest-openapi/src/main/resources/application.properties
index cfab0c7..20829a9 100644
--- a/rest-openapi/src/main/resources/application.properties
+++ b/rest-openapi/src/main/resources/application.properties
@@ -19,7 +19,7 @@
camel.springboot.name = MyCamel
# to reconfigure the camel servlet context-path mapping to use /api/* instead
of /camel/*
-camel.component.servlet.mapping.context-path=/api/*
+camel.servlet.mapping.context-path=/api/*
# rest can also be configured here instead in the CamelRouter class
# rest DSL configuration
diff --git
a/rest-swagger/src/main/java/org/apache/camel/example/springboot/CamelRouter.java
b/rest-swagger/src/main/java/org/apache/camel/example/springboot/CamelRouter.java
index 020638b..a5af5e2 100644
---
a/rest-swagger/src/main/java/org/apache/camel/example/springboot/CamelRouter.java
+++
b/rest-swagger/src/main/java/org/apache/camel/example/springboot/CamelRouter.java
@@ -36,7 +36,7 @@ public class CamelRouter extends RouteBuilder {
@Autowired
private Environment env;
- @Value("${camel.component.servlet.mapping.context-path}")
+ @Value("${camel.servlet.mapping.context-path}")
private String contextPath;
@Override
diff --git a/rest-swagger/src/main/resources/application.properties
b/rest-swagger/src/main/resources/application.properties
index cfab0c7..20829a9 100644
--- a/rest-swagger/src/main/resources/application.properties
+++ b/rest-swagger/src/main/resources/application.properties
@@ -19,7 +19,7 @@
camel.springboot.name = MyCamel
# to reconfigure the camel servlet context-path mapping to use /api/* instead
of /camel/*
-camel.component.servlet.mapping.context-path=/api/*
+camel.servlet.mapping.context-path=/api/*
# rest can also be configured here instead in the CamelRouter class
# rest DSL configuration
diff --git
a/type-converter/src/generated/java/sample/camel/CustomGeneratedConverterLoader.java
b/type-converter/src/generated/java/sample/camel/CustomGeneratedConverterLoader.java
index 9f5df37..7ecac91 100644
---
a/type-converter/src/generated/java/sample/camel/CustomGeneratedConverterLoader.java
+++
b/type-converter/src/generated/java/sample/camel/CustomGeneratedConverterLoader.java
@@ -1,6 +1,9 @@
/* Generated by camel build tools - do NOT edit this file! */
package sample.camel;
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.DeferredContextBinding;
import org.apache.camel.Exchange;
import org.apache.camel.TypeConversionException;
import org.apache.camel.TypeConverterLoaderException;
@@ -14,12 +17,25 @@ import org.apache.camel.util.DoubleMap;
* Generated by camel build tools - do NOT edit this file!
*/
@SuppressWarnings("unchecked")
-public final class CustomGeneratedConverterLoader implements
TypeConverterLoader {
+@DeferredContextBinding
+public final class CustomGeneratedConverterLoader implements
TypeConverterLoader, CamelContextAware {
+
+ private CamelContext camelContext;
public CustomGeneratedConverterLoader() {
}
@Override
+ public void setCamelContext(CamelContext camelContext) {
+ this.camelContext = camelContext;
+ }
+
+ @Override
+ public CamelContext getCamelContext() {
+ return camelContext;
+ }
+
+ @Override
public void load(TypeConverterRegistry registry) throws
TypeConverterLoaderException {
registerConverters(registry);
}
@@ -37,6 +53,7 @@ public final class CustomGeneratedConverterLoader implements
TypeConverterLoader
private sample.camel.CustomGeneratedConverter
getCustomGeneratedConverter() {
if (customGeneratedConverter == null) {
customGeneratedConverter = new
sample.camel.CustomGeneratedConverter();
+ CamelContextAware.trySetCamelContext(customGeneratedConverter,
camelContext);
}
return customGeneratedConverter;
}
diff --git a/undertow-spring-security/src/main/resources/application.properties
b/undertow-spring-security/src/main/resources/application.properties
index 5e245b1..fd592d2 100644
--- a/undertow-spring-security/src/main/resources/application.properties
+++ b/undertow-spring-security/src/main/resources/application.properties
@@ -19,6 +19,6 @@
# which is started on port 8080 (with docker-compose example)
server.port=8081
-camel.component.undertow.spring.security.keycloak.url=http://localhost:8080
-camel.component.undertow.spring.security.keycloak.realmId=example-app
-camel.component.undertow.spring.security.keycloak.clientId=example-service
\ No newline at end of file
+camel.security.undertow.keycloak.url=http://localhost:8080
+camel.security.undertow.keycloak.realmId=example-app
+camel.security.undertow.keycloak.clientId=example-service
\ No newline at end of file
