diff --git a/actuator-http-metrics/src/main/resources/application.properties b/actuator-http-metrics/src/main/resources/application.properties index 839e7bea5..5c375a03a 100644 --- a/actuator-http-metrics/src/main/resources/application.properties +++ b/actuator-http-metrics/src/main/resources/application.properties @@ -29,7 +29,7 @@ management.endpoint.shutdown.enabled=true # expose actuator endpoint via HTTP management.endpoints.web.exposure.include=mappings,metrics,shutdown -camel.springboot.name = MyCamel +camel.main.name = MyCamel # properties used in the route metricsPeriod = 2s diff --git a/aot-basic/src/main/resources/application.properties b/aot-basic/src/main/resources/application.properties index b31e50703..762e0f9b8 100644 --- a/aot-basic/src/main/resources/application.properties +++ b/aot-basic/src/main/resources/application.properties @@ -21,7 +21,7 @@ logging.level.org.apache.camel.health = DEBUG logging.level.org.apache.camel.impl.health = DEBUG logging.level.sample.camel = DEBUG -camel.springboot.name = MyCamelNative +camel.main.name = MyCamelNative camel.springboot.main-run-controller: true diff --git a/arangodb/src/main/resources/application.properties b/arangodb/src/main/resources/application.properties index 3b042fec6..45be295bb 100644 --- a/arangodb/src/main/resources/application.properties +++ b/arangodb/src/main/resources/application.properties @@ -14,7 +14,7 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- -camel.springboot.name=ArangoDB +camel.main.name=ArangoDB camel.springboot.main-run-controller=true camel.component.arangodb.documentCollection=foo camel.component.arangodb.user=root diff --git a/endpointdsl/src/main/resources/application.properties b/endpointdsl/src/main/resources/application.properties index 4db4c8476..8f0f30a9b 100644 --- a/endpointdsl/src/main/resources/application.properties +++ b/endpointdsl/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = MyCamel +camel.main.name = MyCamel # what to say greeting = Hello World diff --git a/fhir-auth-tx/src/main/resources/application.properties b/fhir-auth-tx/src/main/resources/application.properties index 52b609924..adaa5d41c 100644 --- a/fhir-auth-tx/src/main/resources/application.properties +++ b/fhir-auth-tx/src/main/resources/application.properties @@ -24,7 +24,7 @@ fhirVersion=DSTU3 input=target/work/fhir/input # the name of Camel -camel.springboot.name = MyCamel +camel.main.name = MyCamel server.port=0 diff --git a/fhir/src/main/resources/application.properties b/fhir/src/main/resources/application.properties index e318c5726..286a3a1b0 100644 --- a/fhir/src/main/resources/application.properties +++ b/fhir/src/main/resources/application.properties @@ -22,7 +22,7 @@ fhirVersion=R4 input=target/work/fhir/input # the name of Camel -camel.springboot.name = MyCamel +camel.main.name = MyCamel # to automatic shutdown the JVM after a period of time #camel.springboot.duration-max-seconds=60 diff --git a/health-checks/src/main/resources/application.properties b/health-checks/src/main/resources/application.properties index 21f0fbbfb..20dc82fb4 100644 --- a/health-checks/src/main/resources/application.properties +++ b/health-checks/src/main/resources/application.properties @@ -33,7 +33,7 @@ management.health.readinessState.enabled=true # show verbose health details (/actuator/health) so you can see Camel information also management.endpoint.health.show-details=always -camel.springboot.name = MyCamel +camel.main.name = MyCamel # enable JMX which allows to also control health check camel.springboot.jmx-enabled = true diff --git a/http-ssl/ssl-camel-server/src/main/resources/application.properties b/http-ssl/ssl-camel-server/src/main/resources/application.properties index 97aa2a0ba..994441344 100644 --- a/http-ssl/ssl-camel-server/src/main/resources/application.properties +++ b/http-ssl/ssl-camel-server/src/main/resources/application.properties @@ -15,7 +15,7 @@ # limitations under the License. # -camel.springboot.name=ssl-camel-server +camel.main.name=ssl-camel-server camel.component.undertow.ssl-context-parameters=#serverConfig camel.component.undertow.use-global-ssl-context-parameters=true keystore-password=pass123 diff --git a/http-ssl/ssl-client/src/main/resources/application.properties b/http-ssl/ssl-client/src/main/resources/application.properties index b5eaf0bfb..1555b93c1 100644 --- a/http-ssl/ssl-client/src/main/resources/application.properties +++ b/http-ssl/ssl-client/src/main/resources/application.properties @@ -16,7 +16,7 @@ # spring.profiles.active = ${sbProfile} -camel.springboot.name=ssl-client +camel.main.name=ssl-client camel.component.http.use-global-ssl-context-parameters=true management.endpoint.camelroutes.enabled=true management.endpoint.camelroutes.read-only=true diff --git a/http-ssl/ssl-server/src/main/resources/application.properties b/http-ssl/ssl-server/src/main/resources/application.properties index 2e6c392a1..fa6fa7f6e 100644 --- a/http-ssl/ssl-server/src/main/resources/application.properties +++ b/http-ssl/ssl-server/src/main/resources/application.properties @@ -16,7 +16,7 @@ # spring.profiles.active = ${sbProfile} -camel.springboot.name=ssl-server +camel.main.name=ssl-server management.endpoint.camelroutes.enabled=true management.endpoint.camelroutes.read-only=true management.endpoint.health.enabled=true diff --git a/infinispan/src/main/resources/application.properties b/infinispan/src/main/resources/application.properties index 2f382d736..9dbafc5f1 100644 --- a/infinispan/src/main/resources/application.properties +++ b/infinispan/src/main/resources/application.properties @@ -15,7 +15,7 @@ ## limitations under the License. ## --------------------------------------------------------------------------- -camel.springboot.name=Infinispan +camel.main.name=Infinispan camel.springboot.main-run-controller=true camel.component.infinispan.hosts=localhost:11222 camel.component.infinispan.username=admin diff --git a/jolokia/src/main/resources/application.properties b/jolokia/src/main/resources/application.properties index 7d69d7969..77eda11b5 100644 --- a/jolokia/src/main/resources/application.properties +++ b/jolokia/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = CamelJolokia +camel.main.name = CamelJolokia # what to say greeting = Hello World diff --git a/load-balancer-eip/src/main/resources/application.properties b/load-balancer-eip/src/main/resources/application.properties index 1f06b565c..b95885bfe 100644 --- a/load-balancer-eip/src/main/resources/application.properties +++ b/load-balancer-eip/src/main/resources/application.properties @@ -1,5 +1,5 @@ # the name of Camel -camel.springboot.name = CamelLoadBalancerExample +camel.main.name = CamelLoadBalancerExample # to configure logging levels logging.level.org.springframework = INFO diff --git a/mail-ms-exchange-oauth2/src/main/resources/application.properties b/mail-ms-exchange-oauth2/src/main/resources/application.properties index 84446b041..8a8ce36c9 100644 --- a/mail-ms-exchange-oauth2/src/main/resources/application.properties +++ b/mail-ms-exchange-oauth2/src/main/resources/application.properties @@ -15,7 +15,7 @@ # limitations under the License. # -camel.springboot.name: CamelMailExchangeOAuth2 +camel.main.name: CamelMailExchangeOAuth2 # Keep the application running camel.springboot.main-run-controller: true diff --git a/master/src/main/resources/application.properties b/master/src/main/resources/application.properties index 6c063807a..b1ce9f231 100644 --- a/master/src/main/resources/application.properties +++ b/master/src/main/resources/application.properties @@ -27,6 +27,6 @@ logging.level.org.apache.camel.component.atomix = DEBUG logging.level.org.apache.camel.component.master = DEBUG logging.level.org.apache.camel.examples.cluster = DEBUG -camel.springboot.name = SampleClusteredRouteController +camel.main.name = SampleClusteredRouteController camel.springboot.main-run-controller = true diff --git a/metrics/src/main/resources/application.properties b/metrics/src/main/resources/application.properties index 7b612577e..146bba350 100644 --- a/metrics/src/main/resources/application.properties +++ b/metrics/src/main/resources/application.properties @@ -16,4 +16,4 @@ ## --------------------------------------------------------------------------- info.build.name=Example of sending camel metrics to Graphite -camel.springboot.name=camel-example-spring-boot-metrics +camel.main.name=camel-example-spring-boot-metrics diff --git a/multi-datasource-2pc/src/main/resources/application.properties b/multi-datasource-2pc/src/main/resources/application.properties index eb5ace2bd..5073f8603 100644 --- a/multi-datasource-2pc/src/main/resources/application.properties +++ b/multi-datasource-2pc/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = My2PcCamel +camel.main.name = My2PcCamel # how often to trigger the timer (millis) myPeriod = 3000 diff --git a/observation/client/src/main/resources/application.properties b/observation/client/src/main/resources/application.properties index e5a74fb5e..f48d519da 100644 --- a/observation/client/src/main/resources/application.properties +++ b/observation/client/src/main/resources/application.properties @@ -16,10 +16,10 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name=Client +camel.main.name=Client camel.springboot.main-run-controller=true -spring.application.name=${camel.springboot.name} +spring.application.name=${camel.main.name} management.tracing.sampling.probability=1.0 management.endpoints.web.exposure.include=health,metrics,prometheus server.port=5432 diff --git a/observation/service1/src/main/resources/application.properties b/observation/service1/src/main/resources/application.properties index 87cdbc37e..6a399081a 100644 --- a/observation/service1/src/main/resources/application.properties +++ b/observation/service1/src/main/resources/application.properties @@ -16,10 +16,10 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name=Service1 +camel.main.name=Service1 camel.springboot.main-run-controller=true -spring.application.name=${camel.springboot.name} +spring.application.name=${camel.main.name} management.tracing.sampling.probability=1.0 management.endpoints.web.exposure.include=health,metrics,prometheus server.port=6543 diff --git a/observation/service2/src/main/resources/application.properties b/observation/service2/src/main/resources/application.properties index 04f6506fa..924cd7ca0 100644 --- a/observation/service2/src/main/resources/application.properties +++ b/observation/service2/src/main/resources/application.properties @@ -16,10 +16,10 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name=Service2 +camel.main.name=Service2 camel.springboot.main-run-controller=true -spring.application.name=${camel.springboot.name} +spring.application.name=${camel.main.name} management.tracing.sampling.probability=1.0 management.endpoints.web.exposure.include=health,metrics,prometheus server.port=7654 diff --git a/openapi-contract-first/src/main/resources/application.properties b/openapi-contract-first/src/main/resources/application.properties index ae623111e..dcec9602e 100644 --- a/openapi-contract-first/src/main/resources/application.properties +++ b/openapi-contract-first/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = CamelPetStore +camel.main.name = CamelPetStore # application configuration petName = Tony the tiger diff --git a/platform-http/src/main/resources/application.properties b/platform-http/src/main/resources/application.properties index 85a129769..3140be3fa 100644 --- a/platform-http/src/main/resources/application.properties +++ b/platform-http/src/main/resources/application.properties @@ -16,4 +16,4 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = MyCamel +camel.main.name = MyCamel diff --git a/pojo/src/main/resources/application.properties b/pojo/src/main/resources/application.properties index ac3b8d522..0950b01d9 100644 --- a/pojo/src/main/resources/application.properties +++ b/pojo/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # give Camel a name -camel.springboot.name = PojoExample +camel.main.name = PojoExample # keep camel running camel.springboot.main-run-controller = true diff --git a/quartz/src/main/resources/application.properties b/quartz/src/main/resources/application.properties index 9f04abe24..0831af8be 100644 --- a/quartz/src/main/resources/application.properties +++ b/quartz/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # give Camel a name -camel.springboot.name = Quartz-to-Log +camel.main.name = Quartz-to-Log # keep camel running camel.springboot.main-run-controller = true diff --git a/rabbitmq/src/main/resources/application.properties b/rabbitmq/src/main/resources/application.properties index d6fdc6bc8..3641748cd 100644 --- a/rabbitmq/src/main/resources/application.properties +++ b/rabbitmq/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = RabbitCamel +camel.main.name = RabbitCamel # to automatic shutdown the JVM after a period of time #camel.springboot.duration-max-seconds=60 diff --git a/resilience4j/service1/src/main/resources/application.properties b/resilience4j/service1/src/main/resources/application.properties index 94a862ba5..6c90b59b4 100644 --- a/resilience4j/service1/src/main/resources/application.properties +++ b/resilience4j/service1/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name=Service1 +camel.main.name=Service1 camel.springboot.main-run-controller=true # the port number the service will use for accepting incoming HTTP requests diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/resources/application.properties b/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/resources/application.properties index 4e64700fb..1d3110f30 100644 --- a/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/resources/application.properties +++ b/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = cxf-otel-even +camel.main.name = cxf-otel-even camel.springboot.main-run-controller=true service.random.url = http://localhost:8080 #logging.level.org.apache.cxf = TRACE diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/resources/application.properties b/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/resources/application.properties index 0a6755a3a..4dcefc630 100644 --- a/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/resources/application.properties +++ b/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = cxf-otel-odd +camel.main.name = cxf-otel-odd camel.springboot.main-run-controller=true service.random.url = http://localhost:8080 #logging.level.org.apache.cxf = TRACE diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/resources/application.properties b/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/resources/application.properties index dd013fa90..f80bb60a9 100644 --- a/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/resources/application.properties +++ b/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = cxf-otel-random +camel.main.name = cxf-otel-random camel.springboot.main-run-controller=true service.random.url = http://localhost:8080 service.even.url = http://localhost:8081 diff --git a/rest-cxf/src/main/resources/application.properties b/rest-cxf/src/main/resources/application.properties index 0097a4932..2a01fc692 100644 --- a/rest-cxf/src/main/resources/application.properties +++ b/rest-cxf/src/main/resources/application.properties @@ -16,6 +16,6 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = MyCamel +camel.main.name = MyCamel camel.springboot.main-run-controller=true #logging.level.org.apache.cxf = TRACE diff --git a/rest-openapi-springdoc/src/main/resources/application.properties b/rest-openapi-springdoc/src/main/resources/application.properties index 20829a9ab..1a9f7176f 100644 --- a/rest-openapi-springdoc/src/main/resources/application.properties +++ b/rest-openapi-springdoc/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = MyCamel +camel.main.name = MyCamel # to reconfigure the camel servlet context-path mapping to use /api/* instead of /camel/* camel.servlet.mapping.context-path=/api/* diff --git a/rest-openapi/src/main/resources/application.properties b/rest-openapi/src/main/resources/application.properties index 69959a983..a1602c5ef 100644 --- a/rest-openapi/src/main/resources/application.properties +++ b/rest-openapi/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = MyCamel +camel.main.name = MyCamel # to reconfigure the camel servlet context-path mapping to use /api/* instead of /camel/* camel.servlet.mapping.context-path=/api/* diff --git a/route-reload/src/main/resources/application.properties b/route-reload/src/main/resources/application.properties index 42fe96a4a..cc8bcc068 100644 --- a/route-reload/src/main/resources/application.properties +++ b/route-reload/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = ReloadCamel +camel.main.name = ReloadCamel # turn on route reloading on file changes camel.springboot.routes-reload-enabled = true diff --git a/soap-cxf/src/main/resources/application.properties b/soap-cxf/src/main/resources/application.properties index e68dfe116..e2a8dbed6 100644 --- a/soap-cxf/src/main/resources/application.properties +++ b/soap-cxf/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = MyCamel +camel.main.name = MyCamel camel.springboot.main-run-controller=true # logging.level.root=TRACE diff --git a/splitter-eip/src/main/resources/application.properties b/splitter-eip/src/main/resources/application.properties index def0862af..a924a3d27 100644 --- a/splitter-eip/src/main/resources/application.properties +++ b/splitter-eip/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = CamelSpringBootSplitter +camel.main.name = CamelSpringBootSplitter # required for generated Type Converter Loader - Camel 3.x way camel.springboot.load-type-converters=true diff --git a/spring-jdbc/src/main/resources/application.properties b/spring-jdbc/src/main/resources/application.properties index 3f43eb419..04d296e0c 100644 --- a/spring-jdbc/src/main/resources/application.properties +++ b/spring-jdbc/src/main/resources/application.properties @@ -15,7 +15,7 @@ ## limitations under the License. ## --------------------------------------------------------------------------- -camel.springboot.name = MyCamel +camel.main.name = MyCamel camel.springboot.main-run-controller=true camel.servlet.mapping.enabled = true diff --git a/supervising-route-controller/src/main/resources/application.properties b/supervising-route-controller/src/main/resources/application.properties index 5519f946b..710ae228a 100644 --- a/supervising-route-controller/src/main/resources/application.properties +++ b/supervising-route-controller/src/main/resources/application.properties @@ -36,7 +36,7 @@ management.info.camel.enabled=true management.info.camel.verbose=true # the name of Camel -camel.springboot.name = SampleSupervisingRouteController +camel.main.name = SampleSupervisingRouteController # route controller configuration camel.springboot.routeControllerSuperviseEnabled = true diff --git a/tomcat-jdbc/src/main/resources/application.properties b/tomcat-jdbc/src/main/resources/application.properties index cec869a9b..66060498a 100644 --- a/tomcat-jdbc/src/main/resources/application.properties +++ b/tomcat-jdbc/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = MyCamel +camel.main.name = MyCamel spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource // other spring datasource properties diff --git a/twitter-salesforce/src/main/resources/application.properties b/twitter-salesforce/src/main/resources/application.properties index 41d23f1de..bcee0a7c7 100644 --- a/twitter-salesforce/src/main/resources/application.properties +++ b/twitter-salesforce/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- ## name of CamelContext -camel.springboot.name=mention +camel.main.name=mention ## This uses the Twitter 'cameltweet' account for testing purposes. ## do NOT use this twitter account in your applications! diff --git a/type-converter/src/main/resources/application.properties b/type-converter/src/main/resources/application.properties index e967019d5..81234ad76 100644 --- a/type-converter/src/main/resources/application.properties +++ b/type-converter/src/main/resources/application.properties @@ -1,5 +1,5 @@ # the name of Camel -camel.springboot.name = CamelCustomConverterExample +camel.main.name = CamelCustomConverterExample # required for generated Type Converter Loader - Camel 3.x way camel.springboot.load-type-converters=true diff --git a/validator/src/main/resources/application.properties b/validator/src/main/resources/application.properties index ebc6ba718..5a04f8620 100644 --- a/validator/src/main/resources/application.properties +++ b/validator/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = SampleCamel +camel.main.name = SampleCamel # properties used in the Camel route and beans # -------------------------------------------- diff --git a/variables/src/main/resources/application.properties b/variables/src/main/resources/application.properties index 3660a9ed6..2b7c29ca6 100644 --- a/variables/src/main/resources/application.properties +++ b/variables/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = MyCamel +camel.main.name = MyCamel # variables can be pre-configured on startup camel.variable.greeting = Random number diff --git a/xml/src/main/resources/application.properties b/xml/src/main/resources/application.properties index 67115c811..1a340e4a1 100644 --- a/xml/src/main/resources/application.properties +++ b/xml/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = SampleCamel +camel.main.name = SampleCamel # to automatic shutdown the JVM after a period of time #camel.springboot.duration-max-seconds=60