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
The following commit(s) were added to refs/heads/master by this push:
new dbe1c05 Add missing doc in spring xml
dbe1c05 is described below
commit dbe1c0589d86218ec292f9945f1e833d03cc9b49
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Jun 19 11:34:05 2020 +0200
Add missing doc in spring xml
---
.../src/generated/resources/org/apache/camel/spring/camelContext.json | 2 +-
.../src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git
a/components/camel-spring/src/generated/resources/org/apache/camel/spring/camelContext.json
b/components/camel-spring/src/generated/resources/org/apache/camel/spring/camelContext.json
index 4a380f7..e38fb94 100644
---
a/components/camel-spring/src/generated/resources/org/apache/camel/spring/camelContext.json
+++
b/components/camel-spring/src/generated/resources/org/apache/camel/spring/camelContext.json
@@ -47,7 +47,7 @@
"contextScan": { "kind": "element", "displayName": "Context Scan",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.ContextScanDefinition", "deprecated": false, "secret":
false, "description": "Sets the context scanning (eg Spring's
ApplicationContext) information. Context scanning allows for the automatic
discovery of Camel routes runtime for inclusion e.g.
org.apache.camel.builder.RouteBuilder implementations" },
"streamCaching": { "kind": "element", "displayName": "Stream Caching",
"required": false, "type": "object", "javaType":
"org.apache.camel.core.xml.CamelStreamCachingStrategyDefinition", "deprecated":
false, "secret": false, "description": "Configuration of stream caching." },
"jmxAgent": { "kind": "element", "displayName": "JMX Agent", "required":
false, "type": "object", "javaType":
"org.apache.camel.core.xml.CamelJMXAgentDefinition", "deprecated": false,
"secret": false, "description": "Configuration of JMX Agent." },
- "routeController": { "kind": "element", "displayName": "Route Controller",
"required": false, "type": "object", "javaType":
"org.apache.camel.core.xml.CamelRouteControllerDefinition", "deprecated":
false, "secret": false },
+ "routeController": { "kind": "element", "displayName": "Route Controller",
"required": false, "type": "object", "javaType":
"org.apache.camel.core.xml.CamelRouteControllerDefinition", "deprecated":
false, "secret": false, "description": "Configuration of route controller." },
"beansFactory": { "kind": "element", "displayName": "Beans Factory",
"required": true, "type": "array", "javaType":
"java.util.List<org.apache.camel.core.xml.AbstractCamelFactoryBean<java.lang.Object>>",
"oneOf": [ "consumerTemplate", "fluentTemplate", "template" ], "deprecated":
false, "secret": false, "description": "Miscellaneous configurations" },
"beans": { "kind": "element", "displayName": "Beans", "required": true,
"type": "array", "javaType": "java.util.List<java.lang.Object>", "oneOf": [
"errorHandler", "export", "proxy" ], "deprecated": false, "secret": false,
"description": "Miscellaneous configurations" },
"defaultServiceCallConfiguration": { "kind": "element", "displayName":
"Default Service Call Configuration", "required": false, "type": "object",
"javaType": "org.apache.camel.model.cloud.ServiceCallConfigurationDefinition",
"deprecated": false, "secret": false, "description": "ServiceCall EIP default
configuration" },
diff --git
a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
index f556e73..5e7fa0c 100644
---
a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
+++
b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
@@ -687,6 +687,9 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Spr
return camelRouteController;
}
+ /**
+ * Configuration of route controller.
+ */
public void setCamelRouteController(CamelRouteControllerDefinition
camelRouteController) {
this.camelRouteController = camelRouteController;
}
