[camel] 07/07: CAMEL-17079: Deprecate SimpleBuilder and migrate to not use it anymore.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit b486b8a9f534c6edb2859646527c0138870ced30 Author: Claus Ibsen AuthorDate: Thu Oct 14 07:49:28 2021 +0200 CAMEL-17079: Deprecate SimpleBuilder and migrate to not use it anymore. --- docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_13.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_13.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_13.adoc index 279eaf2..cf8dd0e 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_13.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_13.adoc @@ -12,6 +12,9 @@ Added method `getStartedEventNotifiers` to `org.apache.camel.spi.ManagementStrat Added method `scheduleQueue` to `org.apache.camel.spi.ReactiveExecutor`. +The `org.apache.camel.builder.SimpleBuilder` has been deprecated. This builder +was mostly used internally in Camel with the Java DSL in some situations. + === Using custom Debugger Previously when setting a custom org.apache.camel.spi.Debugger, then Camel would automatically
[camel] 02/07: CAMEL-17072: Using custom debug requires to be enabled. Using debug from camel-test fixed.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 01e057268d6e2f7b8f85ce4dd918495b20385ed6
Author: Claus Ibsen
AuthorDate: Thu Oct 14 07:07:15 2021 +0200
CAMEL-17072: Using custom debug requires to be enabled. Using debug from
camel-test fixed.
---
.../main/java/org/apache/camel/test/junit5/CamelTestSupport.java| 4 ++--
.../apache/camel/test/spring/junit5/CamelAnnotationsHandler.java| 4
...tedTest.java => CamelSpringProvidesBreakpointInheritedTest.java} | 2 +-
.../java/org/apache/camel/test/spring/CamelAnnotationsHandler.java | 4
...t.java => CamelSpringRunnerProvidesBreakpointInheritedTest.java} | 2 +-
.../resources/org/apache/camel/test/patterns/applicationContext.xml | 2 +-
.../main/java/org/apache/camel/test/junit4/CamelTestSupport.java| 3 ++-
.../user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_13.adoc | 6 +-
8 files changed, 20 insertions(+), 7 deletions(-)
diff --git
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index 7e6aaa8..dfb8014 100644
---
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -442,10 +442,10 @@ public abstract class CamelTestSupport
// we need to stop the context first to setup the debugger
context.stop();
}
+context.setDebugging(true);
context.setDebugger(new DefaultDebugger());
context.getDebugger().addBreakpoint(breakpoint);
-// when stopping CamelContext it will automatic remove the
-// breakpoint
+// when stopping CamelContext it will automatically remove the
breakpoint
}
template = context.createProducerTemplate();
diff --git
a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java
b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java
index cd56b4c..59f6bff 100644
---
a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java
+++
b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java
@@ -210,6 +210,10 @@ public final class CamelAnnotationsHandler {
public void execute(String contextName, SpringCamelContext
camelContext)
throws Exception {
+
+// automatic turn on debugging when we have breakpoints
+camelContext.setDebugging(true);
+
Debugger debugger = camelContext.getDebugger();
if (debugger == null) {
debugger = new DefaultDebugger();
diff --git
a/components/camel-test/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringProvidesBreakpointInherritedTest.java
b/components/camel-test/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringProvidesBreakpointInheritedTest.java
similarity index 94%
rename from
components/camel-test/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringProvidesBreakpointInherritedTest.java
rename to
components/camel-test/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringProvidesBreakpointInheritedTest.java
index 72f2516..6de0f8f 100644
---
a/components/camel-test/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringProvidesBreakpointInherritedTest.java
+++
b/components/camel-test/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringProvidesBreakpointInheritedTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.test.spring;
-public class CamelSpringProvidesBreakpointInherritedTest
+public class CamelSpringProvidesBreakpointInheritedTest
extends CamelSpringProvidesBreakpointTest {
}
diff --git
a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
index 0d583a9..8e13b6d 100644
---
a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
+++
b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
@@ -211,6 +211,10 @@ public final class CamelAnnotationsHandler {
public void
[camel] 03/07: CAMEL-17079: Deprecate SimpleBuilder and migrate to not use it anymore.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8c3b8701db210e2798a504d6cbae24144e91e12e
Author: Claus Ibsen
AuthorDate: Thu Oct 14 07:17:41 2021 +0200
CAMEL-17079: Deprecate SimpleBuilder and migrate to not use it anymore.
---
.../main/java/org/apache/camel/model/ProcessorDefinition.java | 3 ++-
.../camel/builder/endpoint/AbstractEndpointBuilder.java | 11 ++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 5dde972..2a1267e 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -54,6 +54,7 @@ import org.apache.camel.model.dataformat.CustomDataFormat;
import org.apache.camel.model.language.ConstantExpression;
import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.model.language.LanguageExpression;
+import org.apache.camel.model.language.SimpleExpression;
import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.spi.AsEndpointUri;
@@ -3082,7 +3083,7 @@ public abstract class ProcessorDefinition
@AsEndpointUri EndpointProducerBuilder resourceUri,
AggregationStrategy aggregationStrategy,
boolean aggregateOnException, boolean shareUnitOfWork) {
EnrichDefinition answer = new EnrichDefinition();
-answer.setExpression(resourceUri.expr());
+answer.setExpression(new SimpleExpression(resourceUri.getUri()));
answer.setAggregationStrategy(aggregationStrategy);
answer.setAggregateOnException(Boolean.toString(aggregateOnException));
answer.setShareUnitOfWork(Boolean.toString(shareUnitOfWork));
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
index 8917e92..f77e3e0 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
@@ -31,6 +31,7 @@ import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.SimpleBuilder;
+import org.apache.camel.spi.Language;
import org.apache.camel.spi.NormalizedEndpointUri;
import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.support.EndpointHelper;
@@ -44,6 +45,7 @@ public class AbstractEndpointBuilder {
protected final Map properties = new LinkedHashMap<>();
protected final Map> multivalues = new
HashMap<>();
private volatile Endpoint resolvedEndpoint;
+private volatile Language simple;
public AbstractEndpointBuilder(String scheme, String path) {
this.scheme = scheme;
@@ -184,6 +186,10 @@ public class AbstractEndpointBuilder {
});
}
+/**
+ * Use {@link #expr(CamelContext)}
+ */
+@Deprecated
public Expression expr() {
return SimpleBuilder.simple(getUri());
}
@@ -193,7 +199,10 @@ public class AbstractEndpointBuilder {
// do not encode computed uri as we want to preserve simple
expressions, as this is used
// by ToDynamic which builds the uri string un-encoded for simple
language parser to be able to parse
NormalizedEndpointUri uri = computeUri(new LinkedHashMap<>(),
camelContext, true, false);
-return SimpleBuilder.simple(uri.getUri());
+if (simple == null) {
+simple = camelContext.resolveLanguage("simple");
+}
+return simple.createExpression(uri.getUri());
}
}
[camel] 05/07: CAMEL-17079: Deprecate SimpleBuilder and migrate to not use it anymore.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d6df1fd26f095830dab59684453fd3a574e74b26
Author: Claus Ibsen
AuthorDate: Thu Oct 14 07:34:14 2021 +0200
CAMEL-17079: Deprecate SimpleBuilder and migrate to not use it anymore.
---
.../camel/builder/endpoint/EndpointBuilderFactory.java | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
index c447925..dd07f1a 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
@@ -373,14 +373,21 @@ public interface EndpointBuilderFactory
default org.apache.camel.Expression endpoints(
org.apache.camel.builder.EndpointProducerBuilder... endpoints) {
return new org.apache.camel.support.ExpressionAdapter() {
-List expressions =
Stream.of(endpoints)
-.map(org.apache.camel.builder.EndpointProducerBuilder::expr)
-.collect(Collectors.toList());
+
+private List expressions = null;
@Override
public Object evaluate(org.apache.camel.Exchange exchange) {
return expressions.stream().map(e -> e.evaluate(exchange,
Object.class)).collect(Collectors.toList());
}
+
+@Override
+public void init(org.apache.camel.CamelContext context) {
+super.init(context);
+expressions = Stream.of(endpoints)
+.map(epb -> epb.expr(context))
+.collect(Collectors.toList());
+}
};
}
}
[camel] 06/07: CAMEL-17079: Deprecate SimpleBuilder and migrate to not use it anymore.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a9acd0be4bf7123f25da1d277ae80b9d756a16b4
Author: Claus Ibsen
AuthorDate: Thu Oct 14 07:39:50 2021 +0200
CAMEL-17079: Deprecate SimpleBuilder and migrate to not use it anymore.
---
.../java/org/apache/camel/builder/EndpointConsumerBuilder.java | 5 -
.../java/org/apache/camel/builder/EndpointProducerBuilder.java | 5 -
.../main/java/org/apache/camel/model/ProcessorDefinition.java| 6 +++---
.../apache/camel/builder/endpoint/AbstractEndpointBuilder.java | 9 -
4 files changed, 3 insertions(+), 22 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
index 9a273ff..7b52e88 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
@@ -49,11 +49,6 @@ public interface EndpointConsumerBuilder extends
EndpointConsumerResolver {
void doSetMultiValueProperties(String name, String prefix, Map values);
/**
- * Builds an expression of this endpoint url. This API is only intended
for Camel internally.
- */
-Expression expr();
-
-/**
* Builds a dynamic expression of this endpoint url. This API is only
intended for Camel internally.
*/
Expression expr(CamelContext camelContext);
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
index 252cc24..e5122be 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
@@ -49,11 +49,6 @@ public interface EndpointProducerBuilder extends
EndpointProducerResolver {
void doSetMultiValueProperties(String name, String prefix, Map values);
/**
- * Builds an expression of this endpoint url. This API is only intended
for Camel internally.
- */
-Expression expr();
-
-/**
* Builds a dynamic expression of this endpoint url. This API is only
intended for Camel internally.
*/
Expression expr(CamelContext camelContext);
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 2a1267e..60d3bfb 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -3207,7 +3207,7 @@ public abstract class ProcessorDefinition
* @seeorg.apache.camel.processor.PollEnricher
*/
public Type pollEnrich(EndpointConsumerBuilder resourceUri) {
-return pollEnrich(resourceUri.expr(), -1, (String) null, false);
+return pollEnrich(new SimpleExpression(resourceUri.getUri()), -1,
(String) null, false);
}
/**
@@ -3432,7 +3432,7 @@ public abstract class ProcessorDefinition
public Type pollEnrich(
@AsEndpointUri EndpointConsumerBuilder resourceUri, long timeout,
AggregationStrategy aggregationStrategy,
boolean aggregateOnException) {
-return pollEnrich(resourceUri.expr(), timeout, aggregationStrategy,
aggregateOnException);
+return pollEnrich(new SimpleExpression(resourceUri.getUri()), timeout,
aggregationStrategy, aggregateOnException);
}
/**
@@ -3459,7 +3459,7 @@ public abstract class ProcessorDefinition
public Type pollEnrich(
@AsEndpointUri EndpointConsumerBuilder resourceUri, long timeout,
String aggregationStrategyRef,
boolean aggregateOnException) {
-return pollEnrich(resourceUri.expr(), timeout, aggregationStrategyRef,
aggregateOnException);
+return pollEnrich(new SimpleExpression(resourceUri.getUri()), timeout,
aggregationStrategyRef, aggregateOnException);
}
/**
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
index f77e3e0..ed46421 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
@@ -30,7 +30,6 @@ import org.apache.camel.Expression;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NoSuchEndpointException;
import
[camel] 04/07: CAMEL-17079: Deprecate SimpleBuilder and migrate to not use it anymore.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0d2a4a821dbf632f0f268f4124c8bb96a8d27e4c
Author: Claus Ibsen
AuthorDate: Thu Oct 14 07:33:12 2021 +0200
CAMEL-17079: Deprecate SimpleBuilder and migrate to not use it anymore.
---
.../apache/camel/maven/packaging/EndpointDslMojo.java | 18 ++
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 911de40..ba7216f 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -725,12 +725,22 @@ public class EndpointDslMojo extends
AbstractGeneratorMojo {
javaClass.addMethod().setDefault().setReturnType("org.apache.camel.Expression").setName("endpoints")
.addParameter("org.apache.camel.builder.EndpointProducerBuilder", "endpoints",
true)
.setBody("return new
org.apache.camel.support.ExpressionAdapter() {",
-"List expressions =
Stream.of(endpoints)",
-"
.map(org.apache.camel.builder.EndpointProducerBuilder::expr)",
-".collect(Collectors.toList());", "", "
@Override",
+"",
+"private List
expressions = null;",
+"",
+"@Override",
"public Object evaluate(org.apache.camel.Exchange
exchange) {",
"return expressions.stream().map(e ->
e.evaluate(exchange, Object.class)).collect(Collectors.toList());",
-"}", "};");
+"}",
+"",
+"@Override",
+"public void init(org.apache.camel.CamelContext
context) {",
+"super.init(context);",
+"expressions = Stream.of(endpoints)",
+".map(epb -> epb.expr(context))",
+".collect(Collectors.toList());",
+"}",
+"};");
for (File factory : factories) {
String factoryName = Strings.before(factory.getName(), ".");
[camel] 01/07: CAMEL-17079: Deprecate SimpleBuilder and migrate to not use it anymore.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 077078a7f9b29adf6e6c86f0d4862a35e2cbdf8d
Author: Claus Ibsen
AuthorDate: Wed Oct 13 20:25:50 2021 +0200
CAMEL-17079: Deprecate SimpleBuilder and migrate to not use it anymore.
---
.../datasonnet/CamelDatasonnetJavaDslTest.java | 4 ++--
.../org/apache/camel/builder/BuilderSupport.java| 21 +
.../org/apache/camel/builder/SimpleBuilder.java | 1 +
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git
a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetJavaDslTest.java
b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetJavaDslTest.java
index 6f6a768..7dd4571 100644
---
a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetJavaDslTest.java
+++
b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetJavaDslTest.java
@@ -63,8 +63,8 @@ public class CamelDatasonnetJavaDslTest extends
CamelTestSupport {
from("direct:basicTransform")
.routeId("basicTransform")
.setProperty("test", constant("HelloWorld"))
-.setProperty("count",
simple("1").resultType(Integer.class))
-.setProperty("isActive",
simple("true").resultType(Boolean.class))
+.setProperty("count", simple("1", Integer.class))
+.setProperty("isActive", simple("true", Boolean.class))
.setProperty("1. Full Name", constant("DataSonnet"))
.transform(datasonnet("resource:classpath:simpleMapping.ds", String.class)
.bodyMediaType(MediaTypes.APPLICATION_JSON_VALUE)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
index 97ea58d..31eb93b 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
@@ -28,6 +28,7 @@ import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.model.language.ExchangePropertyExpression;
import org.apache.camel.model.language.HeaderExpression;
+import org.apache.camel.model.language.SimpleExpression;
import org.apache.camel.model.language.XPathExpression;
import org.apache.camel.support.builder.Namespaces;
import org.apache.camel.util.ObjectHelper;
@@ -177,29 +178,33 @@ public abstract class BuilderSupport implements
CamelContextAware {
/**
* Returns a simple expression value builder
*/
-public SimpleBuilder simple(String value) {
-return SimpleBuilder.simple(value);
+public ValueBuilder simple(String value) {
+return simple(value, null);
}
/**
* Returns a simple expression value builder
*/
-public SimpleBuilder simple(String value, Class resultType) {
-return SimpleBuilder.simple(value, resultType);
+public ValueBuilder simple(String value, Class resultType) {
+SimpleExpression exp = new SimpleExpression(value);
+exp.setResultType(resultType);
+return new ValueBuilder(exp);
}
/**
* Returns a simple expression value builder, using String.format style
*/
-public SimpleBuilder simpleF(String format, Object... values) {
-return SimpleBuilder.simpleF(format, values);
+public ValueBuilder simpleF(String format, Object... values) {
+String exp = String.format(format, values);
+return simple(exp);
}
/**
* Returns a simple expression value builder, using String.format style
*/
-public SimpleBuilder simpleF(String format, Class resultType, Object...
values) {
-return SimpleBuilder.simpleF(format, resultType, values);
+public ValueBuilder simpleF(String format, Class resultType, Object...
values) {
+String exp = String.format(format, values);
+return simple(exp, resultType);
}
/**
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/SimpleBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/SimpleBuilder.java
index 0f22e3b..2d631f2 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/SimpleBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/SimpleBuilder.java
@@ -29,6 +29,7 @@ import org.apache.camel.spi.Language;
* This builder is available in the Java DSL from the {@link RouteBuilder}
which means that using simple language for
* {@link Expression}s or {@link
[camel] branch main updated (1c04f01 -> b486b8a)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 1c04f01 Sync deps
new 077078a CAMEL-17079: Deprecate SimpleBuilder and migrate to not use
it anymore.
new 01e0572 CAMEL-17072: Using custom debug requires to be enabled. Using
debug from camel-test fixed.
new 8c3b870 CAMEL-17079: Deprecate SimpleBuilder and migrate to not use
it anymore.
new 0d2a4a8 CAMEL-17079: Deprecate SimpleBuilder and migrate to not use
it anymore.
new d6df1fd CAMEL-17079: Deprecate SimpleBuilder and migrate to not use
it anymore.
new a9acd0b CAMEL-17079: Deprecate SimpleBuilder and migrate to not use
it anymore.
new b486b8a CAMEL-17079: Deprecate SimpleBuilder and migrate to not use
it anymore.
The 7 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:
.../datasonnet/CamelDatasonnetJavaDslTest.java | 4 ++--
.../apache/camel/test/junit5/CamelTestSupport.java | 4 ++--
.../test/spring/junit5/CamelAnnotationsHandler.java | 4
...CamelSpringProvidesBreakpointInheritedTest.java} | 2 +-
.../camel/test/spring/CamelAnnotationsHandler.java | 4
...pringRunnerProvidesBreakpointInheritedTest.java} | 2 +-
.../camel/test/patterns/applicationContext.xml | 2 +-
.../apache/camel/test/junit4/CamelTestSupport.java | 3 ++-
.../org/apache/camel/builder/BuilderSupport.java| 21 +
.../camel/builder/EndpointConsumerBuilder.java | 5 -
.../camel/builder/EndpointProducerBuilder.java | 5 -
.../org/apache/camel/builder/SimpleBuilder.java | 1 +
.../org/apache/camel/model/ProcessorDefinition.java | 9 +
.../builder/endpoint/EndpointBuilderFactory.java| 13 ++---
.../builder/endpoint/AbstractEndpointBuilder.java | 12 ++--
.../ROOT/pages/camel-3x-upgrade-guide-3_13.adoc | 9 -
.../camel/maven/packaging/EndpointDslMojo.java | 18 ++
17 files changed, 74 insertions(+), 44 deletions(-)
rename
components/camel-test/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/{CamelSpringProvidesBreakpointInherritedTest.java
=> CamelSpringProvidesBreakpointInheritedTest.java} (94%)
rename
components/camel-test/camel-test-spring/src/test/java/org/apache/camel/test/spring/{CamelSpringRunnerProvidesBreakpointInherritedTest.java
=> CamelSpringRunnerProvidesBreakpointInheritedTest.java} (93%)
[camel] 02/02: Sync deps
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 1c04f0111aba39b82dcb2f40110d70310a1d92d3 Author: Andrea Cosentino AuthorDate: Thu Oct 14 07:42:19 2021 +0200 Sync deps --- camel-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 707bbd2..d2bea4a 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -66,7 +66,7 @@ 1.10.2 1.10.2 4.1.0 -2.17.58 +2.17.59 2.6.1 1.2.14 2.11.3
[camel] 01/02: Upgrade AWS SDK v2 to version 2.17.59
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 22927f5a228d1662533ab584a7c6ff3eb24ffb56 Author: Andrea Cosentino AuthorDate: Thu Oct 14 06:58:57 2021 +0200 Upgrade AWS SDK v2 to version 2.17.59 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index e8c78ab..0a8df40 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -80,7 +80,7 @@ 1.10.2 1.10.2 4.1.0 -2.17.58 +2.17.59 2.6.1 1.2.14 1.0.3
[camel] branch main updated (2a906e4 -> 1c04f01)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 2a906e4 Pull request for Salesforce Consumer - needed to add .getJSON() to message for raw payload (#6260) new 22927f5 Upgrade AWS SDK v2 to version 2.17.59 new 1c04f01 Sync deps 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-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] branch regen_bot updated (7336e9f -> 2a906e4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 7336e9f add explicit starter-artifactid to core languages add 2a906e4 Pull request for Salesforce Consumer - needed to add .getJSON() to message for raw payload (#6260) No new revisions were added by this update. Summary of changes: .../org/apache/camel/component/salesforce/SalesforceConsumer.java | 6 -- .../apache/camel/component/salesforce/SalesforceConsumerTest.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)
[GitHub] [camel-k] tadayosi opened a new pull request #2694: chore(runtime): update to Camel K Runtime 1.10.0-SNAPSHOT
tadayosi opened a new pull request #2694: URL: https://github.com/apache/camel-k/pull/2694 Needed for PR #2665 **Release Note** ```release-note NONE ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Pull request for Salesforce Consumer - needed to add .getJSON() to message for raw payload (#6260)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 2a906e4 Pull request for Salesforce Consumer - needed to add
.getJSON() to message for raw payload (#6260)
2a906e4 is described below
commit 2a906e469913a26c4ed4a1f288120e0c7527da0f
Author: hakidehari <38669902+hakideh...@users.noreply.github.com>
AuthorDate: Wed Oct 13 23:39:36 2021 -0500
Pull request for Salesforce Consumer - needed to add .getJSON() to message
for raw payload (#6260)
CAMEL-17080: camel-salesforce - Raw mode should store json payload directly
* Update SalesforceConsumer.java
* Updated platform event and cdc event consumer
needed to add message.getJSON() for raw payload configuration.
* Added .getJSON() method call to unit test of raw platform event
---
.../org/apache/camel/component/salesforce/SalesforceConsumer.java | 6 --
.../apache/camel/component/salesforce/SalesforceConsumerTest.java | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
index 6b152bf..56ac9ae 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
@@ -169,7 +169,8 @@ public class SalesforceConsumer extends DefaultConsumer {
in.setHeader("CamelSalesforceRecordIds",
changeEventHeader.get("recordIds"));
if (rawPayload) {
-in.setBody(message);
+// getJSON is used for raw payload
+in.setBody(message.getJSON());
} else {
payload.remove("ChangeEventHeader");
in.setBody(payload);
@@ -198,7 +199,8 @@ public class SalesforceConsumer extends DefaultConsumer {
in.setHeader("CamelSalesforceCreatedDate", platformEvent.getCreated());
if (rawPayload) {
-in.setBody(message);
+// getJSON is used for raw payload
+in.setBody(message.getJSON());
} else {
in.setBody(platformEvent);
}
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
index b9b4027..7306b44 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
@@ -273,7 +273,7 @@ public class SalesforceConsumerTest {
consumer.processMessage(mock(ClientSessionChannel.class), message);
-verify(in).setBody(message);
+verify(in).setBody(message.getJSON());
verify(in).setHeader("CamelSalesforceCreatedDate",
ZonedDateTime.parse("2018-07-06T12:41:04Z"));
verify(in).setHeader("CamelSalesforceReplayId", 4L);
verify(in).setHeader("CamelSalesforceChannel", "/event/TestEvent__e");
[GitHub] [camel] davsclaus merged pull request #6260: Pull request for Salesforce Consumer - needed to add .getJSON() to message for raw payload
davsclaus merged pull request #6260: URL: https://github.com/apache/camel/pull/6260 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-942939568 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 1339736345-435-fac4a772-6515-4847-9e3a-2bd0787daeea * Camel Quarkus Commit: 514afe498e2f4fc6c5988c8ce63cf9163a3d908c * Camel Main Commit: 979a565b8056e6f6a9e54c125fd8cfa6997c771d * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1339736345 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton opened a new issue #2927: [CI] - Camel Main Branch Build Failure
jamesnetherton opened a new issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927 This is a placeholder issue used by the [nightly sync workflow](https://github.com/apache/camel-quarkus/actions/workflows/camel-master-cron.yaml) for the [`camel-main`](https://github.com/apache/camel-quarkus/tree/camel-main) branch. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] github-actions[bot] commented on pull request #644: WIP do not merge Camel spring boot jsonpath
github-actions[bot] commented on pull request #644: URL: https://github.com/apache/camel-website/pull/644#issuecomment-942926302 Preview is available at https://pr-644--camel.netlify.app -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (3830307 -> 7336e9f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 3830307 CAMEL-17073: Fixed simple language caching bug. add 3ff771d Use util boldLink method to construct cell links add bdfd9ab set up moving new manual attributes to header in UpdateReadmeMojo add e9a3de2 switch to starter template include add 7336e9f add explicit starter-artifactid to core languages No new revisions were added by this update. Summary of changes: .../src/main/docs/activemq-component.adoc | 5 +++- .../src/main/docs/ahc-ws-component.adoc| 5 +++- .../camel-ahc/src/main/docs/ahc-component.adoc | 5 +++- .../camel-amqp/src/main/docs/amqp-component.adoc | 5 +++- .../src/main/docs/any23-dataformat.adoc| 5 +++- .../src/main/docs/arangodb-component.adoc | 5 +++- .../src/main/docs/as2-component.adoc | 5 +++- .../camel-asn1/src/main/docs/asn1-dataformat.adoc | 5 +++- .../src/main/docs/asterisk-component.adoc | 5 +++- .../src/main/docs/atlasmap-component.adoc | 5 +++- .../camel-atmos/src/main/docs/atmos-component.adoc | 5 +++- .../main/docs/atmosphere-websocket-component.adoc | 5 +++- .../camel-atom/src/main/docs/atom-component.adoc | 5 +++- .../src/main/docs/atomix-map-component.adoc| 5 +++- .../src/main/docs/atomix-messaging-component.adoc | 5 +++- .../src/main/docs/atomix-multimap-component.adoc | 5 +++- .../src/main/docs/atomix-queue-component.adoc | 5 +++- .../src/main/docs/atomix-set-component.adoc| 5 +++- .../src/main/docs/atomix-value-component.adoc | 5 +++- .../src/main/docs/avro-component.adoc | 5 +++- .../camel-avro/src/main/docs/avro-dataformat.adoc | 5 +++- .../main/docs/aws-secrets-manager-component.adoc | 4 ++- .../camel-aws-xray/src/main/docs/aws-xray.adoc | 8 -- .../src/main/docs/aws2-athena-component.adoc | 4 ++- .../src/main/docs/aws2-cw-component.adoc | 4 ++- .../src/main/docs/aws2-ddb-component.adoc | 4 ++- .../src/main/docs/aws2-ddbstream-component.adoc| 4 ++- .../src/main/docs/aws2-ec2-component.adoc | 4 ++- .../src/main/docs/aws2-ecs-component.adoc | 4 ++- .../src/main/docs/aws2-eks-component.adoc | 4 ++- .../src/main/docs/aws2-eventbridge-component.adoc | 4 ++- .../src/main/docs/aws2-iam-component.adoc | 4 ++- .../src/main/docs/aws2-kinesis-component.adoc | 4 ++- .../main/docs/aws2-kinesis-firehose-component.adoc | 4 ++- .../src/main/docs/aws2-kms-component.adoc | 4 ++- .../src/main/docs/aws2-lambda-component.adoc | 4 ++- .../src/main/docs/aws2-mq-component.adoc | 4 ++- .../src/main/docs/aws2-msk-component.adoc | 4 ++- .../src/main/docs/aws2-s3-component.adoc | 4 ++- .../src/main/docs/aws2-ses-component.adoc | 4 ++- .../src/main/docs/aws2-sns-component.adoc | 4 ++- .../src/main/docs/aws2-sqs-component.adoc | 4 ++- .../src/main/docs/aws2-sts-component.adoc | 4 ++- .../src/main/docs/aws2-translate-component.adoc| 4 ++- .../src/main/docs/azure-cosmosdb-component.adoc| 4 ++- .../src/main/docs/azure-eventhubs-component.adoc | 4 ++- .../src/main/docs/azure-servicebus-component.adoc | 4 ++- .../main/docs/azure-storage-blob-component.adoc| 4 ++- .../docs/azure-storage-datalake-component.adoc | 3 ++ .../main/docs/azure-storage-queue-component.adoc | 4 ++- .../src/main/docs/barcode-dataformat.adoc | 5 +++- .../src/main/docs/base64-dataformat.adoc | 5 +++- .../src/main/docs/bean-validator-component.adoc| 5 +++- .../camel-bean/src/main/docs/bean-component.adoc | 5 +++- .../camel-bean/src/main/docs/bean-language.adoc| 5 +++- .../camel-bean/src/main/docs/class-component.adoc | 5 +++- .../src/main/docs/beanio-dataformat.adoc | 5 +++- .../src/main/docs/beanstalk-component.adoc | 5 +++- .../src/main/docs/bindy-dataformat.adoc| 5 +++- .../src/main/docs/bonita-component.adoc| 5 +++- .../src/main/docs/box-component.adoc | 5 +++- .../src/main/docs/braintree-component.adoc | 5 +++- .../src/main/docs/browse-component.adoc| 5 +++- .../src/main/docs/caffeine-lrucache.adoc | 9 +++--- .../src/main/docs/caffeine-cache-component.adoc| 5 +++- .../main/docs/caffeine-loadcache-component.adoc| 5 +++- .../src/main/docs/cql-component.adoc | 5 +++- .../camel-cbor/src/main/docs/cbor-dataformat.adoc | 5 +++- .../src/main/docs/chatscript-component.adoc| 5 +++- .../camel-chunk/src/main/docs/chunk-component.adoc | 5 +++- .../src/main/docs/cm-sms-component.adoc| 5 +++-
[camel-quarkus] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 38b753c Updated CHANGELOG.md 38b753c is described below commit 38b753ca6cc53972e0625d4dfe4260c6517297f4 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Oct 14 03:12:20 2021 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67bba7a..1f10f62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ **Merged pull requests:** +- Upgrade Quarkus to 2.4.0.CR1 [\#3180](https://github.com/apache/camel-quarkus/pull/3180) ([jamesnetherton](https://github.com/jamesnetherton)) - Update declaring Bean Capability [\#3178](https://github.com/apache/camel-quarkus/pull/3178) ([zbendhiba](https://github.com/zbendhiba)) - Fix path to spring boot docs [\#3177](https://github.com/apache/camel-quarkus/pull/3177) ([jamesnetherton](https://github.com/jamesnetherton)) - Fix \#3169 to add S3 KMS encryption test [\#3176](https://github.com/apache/camel-quarkus/pull/3176) ([zhfeng](https://github.com/zhfeng))
[camel-website] 04/04: add global requires attribute for jsonpath
This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 3d52f2dfa0a46282a1b60ed1c9f91d5b58c3f4b4 Author: David Jencks AuthorDate: Sat Oct 9 00:29:57 2021 -0700 add global requires attribute for jsonpath --- antora-playbook.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index c52c12e..82c560e 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -92,6 +92,9 @@ output: dir: ./documentation asciidoc: + attributes: +requires@: "'util=util/jsonpath-util.js'" + #sb-statistics: on extensions: - ./extensions/table.js - ./extensions/inline-styles.js
[camel-website] 03/04: (UI) Allow anchor class in table cells, so option names can link to themselves.
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 7d5d17e2317febfd628307ab2abd398bc5a766f2
Author: David Jencks
AuthorDate: Fri Oct 8 23:00:19 2021 -0700
(UI) Allow anchor class in table cells, so option names can link to
themselves.
---
antora-ui-camel/src/css/doc.css | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/antora-ui-camel/src/css/doc.css b/antora-ui-camel/src/css/doc.css
index b7946f4..e571bd8 100644
--- a/antora-ui-camel/src/css/doc.css
+++ b/antora-ui-camel/src/css/doc.css
@@ -78,7 +78,8 @@
.doc h3 .anchor,
.doc h4 .anchor,
.doc h5 .anchor,
-.doc h6 .anchor {
+.doc h6 .anchor,
+.doc td .anchor {
position: absolute;
text-decoration: none;
width: 1.75ex;
@@ -95,7 +96,8 @@
.doc h3 .anchor::before,
.doc h4 .anchor::before,
.doc h5 .anchor::before,
-.doc h6 .anchor::before {
+.doc h6 .anchor::before,
+.doc td .anchor::before {
content: '\00a7';
}
@@ -104,7 +106,8 @@
.doc h3:hover .anchor,
.doc h4:hover .anchor,
.doc h5:hover .anchor,
-.doc h6:hover .anchor {
+.doc h6:hover .anchor,
+.doc td:hover .anchor {
visibility: visible;
}
[camel-website] 02/04: upgrade antora-indexer
This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-website.git commit bf760e8ab4dec007585a556717906b16569dcc1d Author: David Jencks AuthorDate: Sun Oct 10 19:45:34 2021 -0700 upgrade antora-indexer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 209217b..a5f75f7 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@antora/cli": "^3.0.0-alpha.9", "@antora/site-generator-default": "^3.0.0-alpha.9", "@deadlinks/cargo-deadlinks": "github-release:deadlinks/cargo-deadlinks:0.8.0/deadlinks-linux", -"@djencks/asciidoctor-antora-indexer": "^0.0.6", +"@djencks/asciidoctor-antora-indexer": "^0.0.7", "@djencks/asciidoctor-jsonpath": "^0.0.4", "@oclif/errors": "^1.3.4", "antora-ui-camel": "workspace:antora-ui-camel",
[camel-website] 01/04: improve util/jsonpath-util.js
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 004d6fa5f78be1047ee506374e329713a0191ec0
Author: David Jencks
AuthorDate: Thu Oct 7 23:42:37 2021 -0700
improve util/jsonpath-util.js
---
util/jsonpath-util.js | 38 +++---
1 file changed, 31 insertions(+), 7 deletions(-)
diff --git a/util/jsonpath-util.js b/util/jsonpath-util.js
index d28ef02..c428408 100644
--- a/util/jsonpath-util.js
+++ b/util/jsonpath-util.js
@@ -10,14 +10,34 @@ module.exports = {
return ''
},
+ boldLink: (text, idPrefix, suffix = '') => {
+const idText = `_${idPrefix}_${text.split('.').join('_')}`
+text = suffix ? `*${text}* (${suffix})` : `*${text}*`
+return `[#${idText}]\nxref:#${idText}['',role=anchor]${text}`
+ },
+
description: (value) => {
try {
- return module.exports.strong(value, "Autowired")
-+ module.exports.strong(value, "Required")
-+ module.exports.strong(value, "Deprecated")
-+ module.exports.escapeAttributes(value.description) +
(value.description.endsWith(".") ? "" : ".")
-+ (value.deprecatedNote ? `\n\nNOTE: ${value.deprecatedNote}` : "")
-+ (value.enum ? `${["\n\nEnum values:\n"].concat(value.enum).join("\n*
")}` : "")
+ return module.exports.strong(value, 'Autowired')
++ module.exports.strong(value, 'Required')
++ module.exports.strong(value, 'Deprecated')
++ (value.description ?
module.exports.escapeAttributes(value.description) +
(value.description.endsWith('.') ? '' : '.') : '')
++ (value.deprecatedNote ? `\n\nNOTE: ${value.deprecatedNote}` : '')
++ (value.enum ? `${['\n\nEnum values:\n'].concat(value.enum).join('\n*
')}` : '')
+} catch (e) {
+ console.log('error', e)
+ return e.msg()
+}
+ },
+
+ description2: (value) => {
+try {
+ return module.exports.strong(value, 'Autowired')
++ module.exports.strong(value, 'Required')
++ module.exports.strong(value, 'Deprecated')
++ (value.description ?
module.exports.escapeAttributes(value.description) +
(value.description.endsWith('.') ? '' : '') : '')
++ (value.deprecatedNote ? `\n\nNOTE: ${value.deprecatedNote}` : '')
++ (value.enum ? `${['\n\nEnum values:\n'].concat(value.enum).join('\n*
')}` : '')
} catch (e) {
console.log('error', e)
return e.msg()
@@ -25,7 +45,7 @@ module.exports = {
},
escapeAttributes: (text) => {
-return text.split('{').join('\\{')
+return text ? text.split('{').join('\\{') : text
},
formatSignature: (signature) => {
@@ -55,6 +75,10 @@ module.exports = {
strong: (data, text) => {
return data[text.toLowerCase()] ? `*${text}* ` : ''
},
+
+ valueAsString: (value) => {
+return value === undefined ? '' : `${value}`
+ },
}
function splitOnce (querySpec, token = '=') {
[camel-website] branch main updated (f0eb1df -> 3d52f2d)
This is an automated email from the ASF dual-hosted git repository. djencks pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-website.git. from f0eb1df Add blog entry and release notes for Camel 3.11.3 new 004d6fa improve util/jsonpath-util.js new bf760e8 upgrade antora-indexer new 7d5d17e (UI) Allow anchor class in table cells, so option names can link to themselves. new 3d52f2d add global requires attribute for jsonpath The 4 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: antora-playbook.yml | 3 +++ antora-ui-camel/src/css/doc.css | 9 ++--- package.json| 2 +- util/jsonpath-util.js | 38 +++--- 4 files changed, 41 insertions(+), 11 deletions(-)
[camel-spring-boot] 01/03: Tooling and template changes to generate autoconfig option tables and lists of starters
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 37642fe58a5a6024cbd21c342fc1ec92b4a0755d
Author: David Jencks
AuthorDate: Wed Oct 6 23:06:45 2021 -0700
Tooling and template changes to generate autoconfig option tables and lists
of starters
(docs/pom.xml) set up copying autoconfigure metadata json files to
examples/json
(UpdateDocComponentsListMojo) correct check for local component
(UpdateSpringBootAutoConfigurationReadmeMojo) copy generated auto-config
json file to src/main/docs
add starter.adoc template
Set index table format as attribute in component descriptor
list.adoc with generated tables
accomodate explicit starter-artifactid in list tables and starter partial
---
.../modules/spring-boot/partials/starter.adoc | 33 +
docs/pom.xml | 6 +-
docs/spring-boot/antora.yml| 3 +
docs/spring-boot/modules/ROOT/nav.adoc | 1 +
.../ROOT/pages/{list.adoc => _list-old.adoc} | 0
docs/spring-boot/modules/ROOT/pages/list.adoc | 950 ++---
.../maven/UpdateDocComponentsListMojo.java | 2 +-
...pdateSpringBootAutoConfigurationReadmeMojo.java | 207 +
.../spring-boot-auto-configure-options.mvel| 30 -
9 files changed, 165 insertions(+), 1067 deletions(-)
diff --git a/docs/components/modules/spring-boot/partials/starter.adoc
b/docs/components/modules/spring-boot/partials/starter.adoc
new file mode 100644
index 000..f3ac705
--- /dev/null
+++ b/docs/components/modules/spring-boot/partials/starter.adoc
@@ -0,0 +1,33 @@
+include::jsonpathcount$spring-boot:example$json/{camel-spring-boot-name}.json[queries='sbpropertiescount=query$.properties[?(!(@.name.endsWith("customizer.enabled")))]']
+
+ifndef::starter-artifactid[]
+:starter-artifactid: {artifactid}-starter
+endif::[]
+
+== Spring Boot Auto-Configuration
+
+When using {shortname} with Spring Boot make sure to use the following Maven
dependency to have support for auto configuration:
+
+[source,xml,subs="+attributes"]
+
+
+ org.apache.camel.springboot
+ {starter-artifactid}
+ x.x.x
+
+
+
+
+ifeval::[{sbpropertiescount} == 0]
+The component has no Spring Boot auto configuration options.
+endif::[]
+ifeval::[{sbpropertiescount} != 0]
+The component supports {sbpropertiescount} options, which are listed below.
+
+[width="100%",cols="2a,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+|===
+
+jsonpathTable2::spring-boot:example$json/{camel-spring-boot-name}.json[query='nodes$.properties[?(!(@.name.endsWith("customizer.enabled")))]',
cellformats='util.boldLink(value.name,
"sb_option")|util.description(value)|util.valueAsString(value.defaultValue)|util.javaSimpleName(value.type)',
{requires}]
+endif::[]
diff --git a/docs/pom.xml b/docs/pom.xml
index 8a1d706..85e3348 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -46,15 +46,15 @@
-
+
-
+
-
+
diff --git a/docs/spring-boot/antora.yml b/docs/spring-boot/antora.yml
index f89cb25..19cbd62 100644
--- a/docs/spring-boot/antora.yml
+++ b/docs/spring-boot/antora.yml
@@ -23,3 +23,6 @@ display_version: 3.13.x (Prerelease)
nav:
- modules/ROOT/nav.adoc
+asciidoc:
+ attributes:
+index-table-format: width="100%",cols="4,3,3,3,6",options="header"
diff --git a/docs/spring-boot/modules/ROOT/nav.adoc
b/docs/spring-boot/modules/ROOT/nav.adoc
index 38fa188..11e0ef4 100644
--- a/docs/spring-boot/modules/ROOT/nav.adoc
+++ b/docs/spring-boot/modules/ROOT/nav.adoc
@@ -1,4 +1,5 @@
* xref:index.adoc[About]
* xref:spring-boot.adoc[Camel Context starter]
* xref:list.adoc[List of starters]
+//* xref:_list-old.adoc[old List of starters]
diff --git a/docs/spring-boot/modules/ROOT/pages/list.adoc
b/docs/spring-boot/modules/ROOT/pages/_list-old.adoc
similarity index 100%
copy from docs/spring-boot/modules/ROOT/pages/list.adoc
copy to docs/spring-boot/modules/ROOT/pages/_list-old.adoc
diff --git a/docs/spring-boot/modules/ROOT/pages/list.adoc
b/docs/spring-boot/modules/ROOT/pages/list.adoc
index a53dc62..d5a1e18 100644
--- a/docs/spring-boot/modules/ROOT/pages/list.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/list.adoc
@@ -1,907 +1,135 @@
= Component Starters
+:cellformats:
cells="$xref,=`$\{artifactid}-starter`,supportlevel,since,description"
+:base-query:
component=components,relative=*.adoc,exclude='*-summary.adoc,index.adoc'
+:base-attributes-query: {base-query},attributes=camel-spring-boot-name
[camel-spring-boot] 02/04: CAMEL-17056: camel-spring-boot-hazelcast-starter - Remove the old customer code as its standard in camel-core now
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-spring-boot-3.12.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 3ed029ccdd38988ff8963a4b72e5c2b90ff3042f
Author: Claus Ibsen
AuthorDate: Sat Oct 9 09:54:37 2021 +0200
CAMEL-17056: camel-spring-boot-hazelcast-starter - Remove the old customer
code as its standard in camel-core now
---
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../AbstractHazelcastInstanceCustomizer.java | 93 --
...ctHazelcastInstanceCustomizerConfiguration.java | 46 ---
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
24 files changed, 799 deletions(-)
diff --git
a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java
b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java
deleted file mode 100644
index 4a4c24a..000
---
a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.hazelcast.atomicnumber.springboot.customizer;
-
-import
org.apache.camel.component.hazelcast.atomicnumber.HazelcastAtomicnumberComponent;
-import
org.apache.camel.component.hazelcast.springboot.customizer.AbstractHazelcastInstanceCustomizer;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@Conditional(HazelcastInstanceCustomizer.NestedConditions.class)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
-@EnableConfigurationProperties(HazelcastInstanceCustomizerConfiguration.class)
-public class HazelcastInstanceCustomizer extends
AbstractHazelcastInstanceCustomizer {
-@Override
-public String getId() {
-return
"camel.component.hazelcast-atomicvalue.customizer.hazelcast-instance";
-}
-}
diff --git
a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizerConfiguration.java
b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizerConfiguration.java
deleted file mode 100644
index c85058b..000
---
[camel-spring-boot] 01/04: Tooling and template changes to generate autoconfig option tables and lists of starters
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-spring-boot-3.12.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 025fb8dc7063d36d6256a4600d4dafeee3d7093b
Author: David Jencks
AuthorDate: Wed Oct 6 23:06:45 2021 -0700
Tooling and template changes to generate autoconfig option tables and lists
of starters
(docs/pom.xml) set up copying autoconfigure metadata json files to
examples/json
(UpdateDocComponentsListMojo) correct check for local component
(UpdateSpringBootAutoConfigurationReadmeMojo) copy generated auto-config
json file to src/main/docs
add starter.adoc template
Set index table format as attribute in component descriptor
list.adoc with generated tables
accomodate explicit starter-artifactid in list tables and starter partial
---
.../modules/spring-boot/partials/starter.adoc | 33 +
docs/pom.xml | 6 +-
docs/spring-boot/antora.yml| 3 +
docs/spring-boot/modules/ROOT/nav.adoc | 1 +
.../ROOT/pages/{list.adoc => _list-old.adoc} | 0
docs/spring-boot/modules/ROOT/pages/list.adoc | 950 ++---
.../maven/UpdateDocComponentsListMojo.java | 2 +-
...pdateSpringBootAutoConfigurationReadmeMojo.java | 207 +
.../spring-boot-auto-configure-options.mvel| 30 -
9 files changed, 165 insertions(+), 1067 deletions(-)
diff --git a/docs/components/modules/spring-boot/partials/starter.adoc
b/docs/components/modules/spring-boot/partials/starter.adoc
new file mode 100644
index 000..f3ac705
--- /dev/null
+++ b/docs/components/modules/spring-boot/partials/starter.adoc
@@ -0,0 +1,33 @@
+include::jsonpathcount$spring-boot:example$json/{camel-spring-boot-name}.json[queries='sbpropertiescount=query$.properties[?(!(@.name.endsWith("customizer.enabled")))]']
+
+ifndef::starter-artifactid[]
+:starter-artifactid: {artifactid}-starter
+endif::[]
+
+== Spring Boot Auto-Configuration
+
+When using {shortname} with Spring Boot make sure to use the following Maven
dependency to have support for auto configuration:
+
+[source,xml,subs="+attributes"]
+
+
+ org.apache.camel.springboot
+ {starter-artifactid}
+ x.x.x
+
+
+
+
+ifeval::[{sbpropertiescount} == 0]
+The component has no Spring Boot auto configuration options.
+endif::[]
+ifeval::[{sbpropertiescount} != 0]
+The component supports {sbpropertiescount} options, which are listed below.
+
+[width="100%",cols="2a,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+|===
+
+jsonpathTable2::spring-boot:example$json/{camel-spring-boot-name}.json[query='nodes$.properties[?(!(@.name.endsWith("customizer.enabled")))]',
cellformats='util.boldLink(value.name,
"sb_option")|util.description(value)|util.valueAsString(value.defaultValue)|util.javaSimpleName(value.type)',
{requires}]
+endif::[]
diff --git a/docs/pom.xml b/docs/pom.xml
index 0ab3b13..2f0329a 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -46,15 +46,15 @@
-
+
-
+
-
+
diff --git a/docs/spring-boot/antora.yml b/docs/spring-boot/antora.yml
index 3e17aea..76cb990 100644
--- a/docs/spring-boot/antora.yml
+++ b/docs/spring-boot/antora.yml
@@ -21,3 +21,6 @@ version: 3.12.x
nav:
- modules/ROOT/nav.adoc
+asciidoc:
+ attributes:
+index-table-format: width="100%",cols="4,3,3,3,6",options="header"
diff --git a/docs/spring-boot/modules/ROOT/nav.adoc
b/docs/spring-boot/modules/ROOT/nav.adoc
index 38fa188..870435d 100644
--- a/docs/spring-boot/modules/ROOT/nav.adoc
+++ b/docs/spring-boot/modules/ROOT/nav.adoc
@@ -1,4 +1,5 @@
* xref:index.adoc[About]
* xref:spring-boot.adoc[Camel Context starter]
* xref:list.adoc[List of starters]
+//* xref:list-old.adoc[old List of starters]
diff --git a/docs/spring-boot/modules/ROOT/pages/list.adoc
b/docs/spring-boot/modules/ROOT/pages/_list-old.adoc
similarity index 100%
copy from docs/spring-boot/modules/ROOT/pages/list.adoc
copy to docs/spring-boot/modules/ROOT/pages/_list-old.adoc
diff --git a/docs/spring-boot/modules/ROOT/pages/list.adoc
b/docs/spring-boot/modules/ROOT/pages/list.adoc
index c6ad933..d5a1e18 100644
--- a/docs/spring-boot/modules/ROOT/pages/list.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/list.adoc
@@ -1,907 +1,135 @@
= Component Starters
+:cellformats:
cells="$xref,=`$\{artifactid}-starter`,supportlevel,since,description"
+:base-query:
component=components,relative=*.adoc,exclude='*-summary.adoc,index.adoc'
+:base-attributes-query: {base-query},attributes=camel-spring-boot-name
[camel-k] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 3bf7b48 Updated CHANGELOG.md 3bf7b48 is described below commit 3bf7b488fd1577d89d2c56fca659ca3be1e84bbc Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Oct 14 03:09:41 2021 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5644da4..75fb32b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ **Merged pull requests:** +- fix: Integration readiness status should account for updated replicas [\#2691](https://github.com/apache/camel-k/pull/2691) ([astefanutti](https://github.com/astefanutti)) - fix\(e2e\): Resolve kamel bind e2e test conflict [\#2686](https://github.com/apache/camel-k/pull/2686) ([astefanutti](https://github.com/astefanutti)) - Fix \#1943: allow multiple operators to reconcile label filtered resources [\#2683](https://github.com/apache/camel-k/pull/2683) ([nicolaferraro](https://github.com/nicolaferraro)) - feat: Comprehensive Integration error status [\#2682](https://github.com/apache/camel-k/pull/2682) ([astefanutti](https://github.com/astefanutti))
[camel-spring-boot] 01/05: Tooling and template changes to geneerate autoconfig option tables and lists of starters
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-spring-boot-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 6cffc8b5db993dcf0af2508fa1c72cc0e4a09bc9
Author: David Jencks
AuthorDate: Wed Oct 6 23:06:45 2021 -0700
Tooling and template changes to geneerate autoconfig option tables and
lists of starters
(docs/pom.xml) set up copying autoconfigure metadata json files to
examples/json
(UpdateSpringBootAutoConfigurationReadmeMojo) copy generated auto-config
json file to src/main/docs
add starter.adoc template
Set index table format as attribute in component descriptor
list.adoc with generated tables
accomodate explicit starter-artifactid in list tables and starter partial
---
.../modules/spring-boot/partials/starter.adoc | 33 +
docs/pom.xml | 6 +-
docs/spring-boot/antora.yml| 3 +
docs/spring-boot/modules/ROOT/nav.adoc | 1 +
.../ROOT/pages/{list.adoc => _list-old.adoc} | 0
docs/spring-boot/modules/ROOT/pages/list.adoc | 962 ++---
...pdateSpringBootAutoConfigurationReadmeMojo.java | 207 +
.../spring-boot-auto-configure-options.mvel| 30 -
8 files changed, 170 insertions(+), 1072 deletions(-)
diff --git a/docs/components/modules/spring-boot/partials/starter.adoc
b/docs/components/modules/spring-boot/partials/starter.adoc
new file mode 100644
index 000..f3ac705
--- /dev/null
+++ b/docs/components/modules/spring-boot/partials/starter.adoc
@@ -0,0 +1,33 @@
+include::jsonpathcount$spring-boot:example$json/{camel-spring-boot-name}.json[queries='sbpropertiescount=query$.properties[?(!(@.name.endsWith("customizer.enabled")))]']
+
+ifndef::starter-artifactid[]
+:starter-artifactid: {artifactid}-starter
+endif::[]
+
+== Spring Boot Auto-Configuration
+
+When using {shortname} with Spring Boot make sure to use the following Maven
dependency to have support for auto configuration:
+
+[source,xml,subs="+attributes"]
+
+
+ org.apache.camel.springboot
+ {starter-artifactid}
+ x.x.x
+
+
+
+
+ifeval::[{sbpropertiescount} == 0]
+The component has no Spring Boot auto configuration options.
+endif::[]
+ifeval::[{sbpropertiescount} != 0]
+The component supports {sbpropertiescount} options, which are listed below.
+
+[width="100%",cols="2a,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+|===
+
+jsonpathTable2::spring-boot:example$json/{camel-spring-boot-name}.json[query='nodes$.properties[?(!(@.name.endsWith("customizer.enabled")))]',
cellformats='util.boldLink(value.name,
"sb_option")|util.description(value)|util.valueAsString(value.defaultValue)|util.javaSimpleName(value.type)',
{requires}]
+endif::[]
diff --git a/docs/pom.xml b/docs/pom.xml
index 81d2ee4..8c9bcf2 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -47,15 +47,15 @@
-
+
-
+
-
+
diff --git a/docs/spring-boot/antora.yml b/docs/spring-boot/antora.yml
index 665a606..29e9a52 100644
--- a/docs/spring-boot/antora.yml
+++ b/docs/spring-boot/antora.yml
@@ -22,3 +22,6 @@ display_version: 3.7.x (LTS)
nav:
- modules/ROOT/nav.adoc
+asciidoc:
+ attributes:
+index-table-format: width="100%",cols="4,3,3,3,6",options="header"
diff --git a/docs/spring-boot/modules/ROOT/nav.adoc
b/docs/spring-boot/modules/ROOT/nav.adoc
index 7420e26..5bf9c07 100644
--- a/docs/spring-boot/modules/ROOT/nav.adoc
+++ b/docs/spring-boot/modules/ROOT/nav.adoc
@@ -5,4 +5,5 @@
** xref:spring-cloud-netflix.adoc[Camel Spring Cloud Netflix]
** xref:spring-cloud-consul.adoc[Camel Spring Cloud Consul]
* xref:list.adoc[List of starters]
+//* xref:list-old.adoc[old List of starters]
diff --git a/docs/spring-boot/modules/ROOT/pages/list.adoc
b/docs/spring-boot/modules/ROOT/pages/_list-old.adoc
similarity index 100%
copy from docs/spring-boot/modules/ROOT/pages/list.adoc
copy to docs/spring-boot/modules/ROOT/pages/_list-old.adoc
diff --git a/docs/spring-boot/modules/ROOT/pages/list.adoc
b/docs/spring-boot/modules/ROOT/pages/list.adoc
index 96d0c82..79e20ad 100644
--- a/docs/spring-boot/modules/ROOT/pages/list.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/list.adoc
@@ -1,915 +1,143 @@
= Component Starters
+:cellformats:
cells="$xref,=`$\{artifactid}-starter`,supportlevel,since,description"
+:base-query:
component=components,relative=*.adoc,exclude='*-summary.adoc,index.adoc'
+:base-attributes-query: {base-query},attributes=camel-spring-boot-name
+:base-deprecated-query:
[camel-spring-boot] 02/05: add metadata to spring-cloud pages
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-spring-boot-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 141e57084ded37fceecd29435b8650decd6d010c
Author: David Jencks
AuthorDate: Tue Oct 12 14:17:37 2021 -0700
add metadata to spring-cloud pages
---
docs/spring-boot/modules/ROOT/pages/spring-cloud-consul.adoc| 4 +++-
docs/spring-boot/modules/ROOT/pages/spring-cloud-netflix.adoc | 4 +++-
docs/spring-boot/modules/ROOT/pages/spring-cloud-zookeeper.adoc | 4 +++-
docs/spring-boot/modules/ROOT/pages/spring-cloud.adoc | 4 +++-
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/docs/spring-boot/modules/ROOT/pages/spring-cloud-consul.adoc
b/docs/spring-boot/modules/ROOT/pages/spring-cloud-consul.adoc
index a491950..3117092 100644
--- a/docs/spring-boot/modules/ROOT/pages/spring-cloud-consul.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/spring-cloud-consul.adoc
@@ -1,6 +1,8 @@
= Spring Cloud Consul (deprecated)
:since: 2.22
+:artifactid: camel-spring-cloud-consul
:supportLevel: Stable-deprecated
:deprecated: *deprecated*
+:description: Camel Cloud integration with Spring Cloud Consul
-*Since Camel 2.22*
+*Since Camel {since}*
diff --git a/docs/spring-boot/modules/ROOT/pages/spring-cloud-netflix.adoc
b/docs/spring-boot/modules/ROOT/pages/spring-cloud-netflix.adoc
index 2099db9..ce15b77 100644
--- a/docs/spring-boot/modules/ROOT/pages/spring-cloud-netflix.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/spring-cloud-netflix.adoc
@@ -1,9 +1,11 @@
= Spring Cloud Netflix (deprecated)
:since: 2.19
+:artifactid: camel-spring-cloud-netflix
:supportLevel: Stable-deprecated
:deprecated: *deprecated*
+:description: Camel Cloud integration with Spring Cloud Netflix
-*Since Camel 2.19*
+*Since Camel {since}*
The Spring Cloud Netflix component bridges Camel Cloud and Spring Cloud
Netflix so you can leverage Spring Cloud Netflix service discovery and load
balance features in Camel and/or you can use Camel Service Discovery
implementations as ServerList source for Spring Cloud Netflix's Ribbon load
balancer.
diff --git a/docs/spring-boot/modules/ROOT/pages/spring-cloud-zookeeper.adoc
b/docs/spring-boot/modules/ROOT/pages/spring-cloud-zookeeper.adoc
index cc726ff..61bb7a7 100644
--- a/docs/spring-boot/modules/ROOT/pages/spring-cloud-zookeeper.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/spring-cloud-zookeeper.adoc
@@ -1,6 +1,8 @@
= Spring Cloud Zookeeper (deprecated)
:since: 2.22
+:artifactid: camel-spring-cloud-zookeeper
:supportLevel: Stable-deprecated
:deprecated: *deprecated*
+:description: Camel Cloud integration with Spring Cloud Zookeeper
-*Since Camel 2.22*
+*Since Camel {since}*
diff --git a/docs/spring-boot/modules/ROOT/pages/spring-cloud.adoc
b/docs/spring-boot/modules/ROOT/pages/spring-cloud.adoc
index f8c9418..5a01ad8 100644
--- a/docs/spring-boot/modules/ROOT/pages/spring-cloud.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/spring-cloud.adoc
@@ -1,10 +1,12 @@
[[SpringCloud-SpringCloud]]
= Spring Cloud (deprecated)
+:artifactid: camel-spring-cloud
:since: 2.19
:supportLevel: Stable-deprecated
:deprecated: *deprecated*
+:description: Camel Cloud integration with Spring Cloud
-*Since Camel 2.19*
+*Since Camel {since}*
Spring Cloud component
[camel-spring-boot] 03/05: CAMEL-17056: camel-spring-boot-hazelcast-starter - Remove the old customer code as its standard in camel-core now
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-spring-boot-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit c68fe61742cafc93460f5242b798e02c6f86566d
Author: Claus Ibsen
AuthorDate: Sat Oct 9 09:54:37 2021 +0200
CAMEL-17056: camel-spring-boot-hazelcast-starter - Remove the old customer
code as its standard in camel-core now
---
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../AbstractHazelcastInstanceCustomizer.java | 93 --
...ctHazelcastInstanceCustomizerConfiguration.java | 46 ---
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
24 files changed, 799 deletions(-)
diff --git
a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java
b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java
deleted file mode 100644
index 4a4c24a..000
---
a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.hazelcast.atomicnumber.springboot.customizer;
-
-import
org.apache.camel.component.hazelcast.atomicnumber.HazelcastAtomicnumberComponent;
-import
org.apache.camel.component.hazelcast.springboot.customizer.AbstractHazelcastInstanceCustomizer;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@Conditional(HazelcastInstanceCustomizer.NestedConditions.class)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
-@EnableConfigurationProperties(HazelcastInstanceCustomizerConfiguration.class)
-public class HazelcastInstanceCustomizer extends
AbstractHazelcastInstanceCustomizer {
-@Override
-public String getId() {
-return
"camel.component.hazelcast-atomicvalue.customizer.hazelcast-instance";
-}
-}
diff --git
a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizerConfiguration.java
b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizerConfiguration.java
deleted file mode 100644
index c85058b..000
---
[camel-spring-boot] 01/05: Tooling and template changes to generate autoconfig option tables and lists of starters
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-spring-boot-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit fe4687088ed98e5ad35abed6416442469e8420d7
Author: David Jencks
AuthorDate: Wed Oct 6 23:06:45 2021 -0700
Tooling and template changes to generate autoconfig option tables and lists
of starters
(docs/pom.xml) set up copying autoconfigure metadata json files to
examples/json
(UpdateSpringBootAutoConfigurationReadmeMojo) copy generated auto-config
json file to src/main/docs
add starter.adoc template
Set index table format as attribute in component descriptor
list.adoc with generated tables
accomodate explicit starter-artifactid in list tables and starter partial
---
.../modules/spring-boot/partials/starter.adoc | 33 +
docs/pom.xml | 6 +-
docs/spring-boot/antora.yml| 4 +
docs/spring-boot/modules/ROOT/nav.adoc | 1 +
.../ROOT/pages/{list.adoc => _list-old.adoc} | 0
docs/spring-boot/modules/ROOT/pages/list.adoc | 952 ++---
...pdateSpringBootAutoConfigurationReadmeMojo.java | 207 +
.../spring-boot-auto-configure-options.mvel| 30 -
8 files changed, 171 insertions(+), 1062 deletions(-)
diff --git a/docs/components/modules/spring-boot/partials/starter.adoc
b/docs/components/modules/spring-boot/partials/starter.adoc
new file mode 100644
index 000..f3ac705
--- /dev/null
+++ b/docs/components/modules/spring-boot/partials/starter.adoc
@@ -0,0 +1,33 @@
+include::jsonpathcount$spring-boot:example$json/{camel-spring-boot-name}.json[queries='sbpropertiescount=query$.properties[?(!(@.name.endsWith("customizer.enabled")))]']
+
+ifndef::starter-artifactid[]
+:starter-artifactid: {artifactid}-starter
+endif::[]
+
+== Spring Boot Auto-Configuration
+
+When using {shortname} with Spring Boot make sure to use the following Maven
dependency to have support for auto configuration:
+
+[source,xml,subs="+attributes"]
+
+
+ org.apache.camel.springboot
+ {starter-artifactid}
+ x.x.x
+
+
+
+
+ifeval::[{sbpropertiescount} == 0]
+The component has no Spring Boot auto configuration options.
+endif::[]
+ifeval::[{sbpropertiescount} != 0]
+The component supports {sbpropertiescount} options, which are listed below.
+
+[width="100%",cols="2a,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+|===
+
+jsonpathTable2::spring-boot:example$json/{camel-spring-boot-name}.json[query='nodes$.properties[?(!(@.name.endsWith("customizer.enabled")))]',
cellformats='util.boldLink(value.name,
"sb_option")|util.description(value)|util.valueAsString(value.defaultValue)|util.javaSimpleName(value.type)',
{requires}]
+endif::[]
diff --git a/docs/pom.xml b/docs/pom.xml
index 2876e75..98d1484 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -46,15 +46,15 @@
-
+
-
+
-
+
diff --git a/docs/spring-boot/antora.yml b/docs/spring-boot/antora.yml
index 11f0bc7..0dc5b5a 100644
--- a/docs/spring-boot/antora.yml
+++ b/docs/spring-boot/antora.yml
@@ -21,3 +21,7 @@ version: 3.11.x
display_version: 3.11.x (LTS)
nav:
- modules/ROOT/nav.adoc
+
+asciidoc:
+ attributes:
+index-table-format: width="100%",cols="4,3,3,3,6",options="header"
diff --git a/docs/spring-boot/modules/ROOT/nav.adoc
b/docs/spring-boot/modules/ROOT/nav.adoc
index 7420e26..5bf9c07 100644
--- a/docs/spring-boot/modules/ROOT/nav.adoc
+++ b/docs/spring-boot/modules/ROOT/nav.adoc
@@ -5,4 +5,5 @@
** xref:spring-cloud-netflix.adoc[Camel Spring Cloud Netflix]
** xref:spring-cloud-consul.adoc[Camel Spring Cloud Consul]
* xref:list.adoc[List of starters]
+//* xref:list-old.adoc[old List of starters]
diff --git a/docs/spring-boot/modules/ROOT/pages/list.adoc
b/docs/spring-boot/modules/ROOT/pages/_list-old.adoc
similarity index 100%
copy from docs/spring-boot/modules/ROOT/pages/list.adoc
copy to docs/spring-boot/modules/ROOT/pages/_list-old.adoc
diff --git a/docs/spring-boot/modules/ROOT/pages/list.adoc
b/docs/spring-boot/modules/ROOT/pages/list.adoc
index 4e34a5a..79e20ad 100644
--- a/docs/spring-boot/modules/ROOT/pages/list.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/list.adoc
@@ -1,905 +1,143 @@
= Component Starters
+:cellformats:
cells="$xref,=`$\{artifactid}-starter`,supportlevel,since,description"
+:base-query:
component=components,relative=*.adoc,exclude='*-summary.adoc,index.adoc'
+:base-attributes-query: {base-query},attributes=camel-spring-boot-name
+:base-deprecated-query:
[camel-spring-boot] 03/05: CAMEL-17056: camel-spring-boot-hazelcast-starter - Remove the old customer code as its standard in camel-core now
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-spring-boot-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit bff89b41a7abb40675f136b6132be26dc4ff486c
Author: Claus Ibsen
AuthorDate: Sat Oct 9 09:54:37 2021 +0200
CAMEL-17056: camel-spring-boot-hazelcast-starter - Remove the old customer
code as its standard in camel-core now
---
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
.../AbstractHazelcastInstanceCustomizer.java | 93 --
...ctHazelcastInstanceCustomizerConfiguration.java | 46 ---
.../customizer/HazelcastInstanceCustomizer.java| 36 -
.../HazelcastInstanceCustomizerConfiguration.java | 24 --
24 files changed, 799 deletions(-)
diff --git
a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java
b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java
deleted file mode 100644
index 4a4c24a..000
---
a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.hazelcast.atomicnumber.springboot.customizer;
-
-import
org.apache.camel.component.hazelcast.atomicnumber.HazelcastAtomicnumberComponent;
-import
org.apache.camel.component.hazelcast.springboot.customizer.AbstractHazelcastInstanceCustomizer;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@Conditional(HazelcastInstanceCustomizer.NestedConditions.class)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
-@EnableConfigurationProperties(HazelcastInstanceCustomizerConfiguration.class)
-public class HazelcastInstanceCustomizer extends
AbstractHazelcastInstanceCustomizer {
-@Override
-public String getId() {
-return
"camel.component.hazelcast-atomicvalue.customizer.hazelcast-instance";
-}
-}
diff --git
a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizerConfiguration.java
b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizerConfiguration.java
deleted file mode 100644
index c85058b..000
---
[camel-spring-boot] 02/05: add metadata to spring-cloud pages
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-spring-boot-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit cf7e226884e99ca1bc769925455bddc28b3316ab
Author: David Jencks
AuthorDate: Tue Oct 12 14:17:37 2021 -0700
add metadata to spring-cloud pages
---
docs/spring-boot/modules/ROOT/pages/spring-cloud-consul.adoc| 4 +++-
docs/spring-boot/modules/ROOT/pages/spring-cloud-netflix.adoc | 4 +++-
docs/spring-boot/modules/ROOT/pages/spring-cloud-zookeeper.adoc | 4 +++-
docs/spring-boot/modules/ROOT/pages/spring-cloud.adoc | 4 +++-
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/docs/spring-boot/modules/ROOT/pages/spring-cloud-consul.adoc
b/docs/spring-boot/modules/ROOT/pages/spring-cloud-consul.adoc
index a491950..3117092 100644
--- a/docs/spring-boot/modules/ROOT/pages/spring-cloud-consul.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/spring-cloud-consul.adoc
@@ -1,6 +1,8 @@
= Spring Cloud Consul (deprecated)
:since: 2.22
+:artifactid: camel-spring-cloud-consul
:supportLevel: Stable-deprecated
:deprecated: *deprecated*
+:description: Camel Cloud integration with Spring Cloud Consul
-*Since Camel 2.22*
+*Since Camel {since}*
diff --git a/docs/spring-boot/modules/ROOT/pages/spring-cloud-netflix.adoc
b/docs/spring-boot/modules/ROOT/pages/spring-cloud-netflix.adoc
index 2099db9..ce15b77 100644
--- a/docs/spring-boot/modules/ROOT/pages/spring-cloud-netflix.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/spring-cloud-netflix.adoc
@@ -1,9 +1,11 @@
= Spring Cloud Netflix (deprecated)
:since: 2.19
+:artifactid: camel-spring-cloud-netflix
:supportLevel: Stable-deprecated
:deprecated: *deprecated*
+:description: Camel Cloud integration with Spring Cloud Netflix
-*Since Camel 2.19*
+*Since Camel {since}*
The Spring Cloud Netflix component bridges Camel Cloud and Spring Cloud
Netflix so you can leverage Spring Cloud Netflix service discovery and load
balance features in Camel and/or you can use Camel Service Discovery
implementations as ServerList source for Spring Cloud Netflix's Ribbon load
balancer.
diff --git a/docs/spring-boot/modules/ROOT/pages/spring-cloud-zookeeper.adoc
b/docs/spring-boot/modules/ROOT/pages/spring-cloud-zookeeper.adoc
index cc726ff..61bb7a7 100644
--- a/docs/spring-boot/modules/ROOT/pages/spring-cloud-zookeeper.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/spring-cloud-zookeeper.adoc
@@ -1,6 +1,8 @@
= Spring Cloud Zookeeper (deprecated)
:since: 2.22
+:artifactid: camel-spring-cloud-zookeeper
:supportLevel: Stable-deprecated
:deprecated: *deprecated*
+:description: Camel Cloud integration with Spring Cloud Zookeeper
-*Since Camel 2.22*
+*Since Camel {since}*
diff --git a/docs/spring-boot/modules/ROOT/pages/spring-cloud.adoc
b/docs/spring-boot/modules/ROOT/pages/spring-cloud.adoc
index f8c9418..5a01ad8 100644
--- a/docs/spring-boot/modules/ROOT/pages/spring-cloud.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/spring-cloud.adoc
@@ -1,10 +1,12 @@
[[SpringCloud-SpringCloud]]
= Spring Cloud (deprecated)
+:artifactid: camel-spring-cloud
:since: 2.19
:supportLevel: Stable-deprecated
:deprecated: *deprecated*
+:description: Camel Cloud integration with Spring Cloud
-*Since Camel 2.19*
+*Since Camel {since}*
Spring Cloud component
[camel] 03/04: add explicit starter-artifactid to core languages
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2ec43a7e624258c50e6c994d0f43fd08336c4ee3
Author: David Jencks
AuthorDate: Wed Oct 13 12:59:59 2021 -0700
add explicit starter-artifactid to core languages
---
.../src/main/docs/modules/languages/pages/constant-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/csimple-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/exchangeProperty-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/file-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/header-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/ref-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/simple-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/tokenize-language.adoc | 1 +
8 files changed, 8 insertions(+)
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/constant-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/constant-language.adoc
index 10691b7..a9ac95d 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/constant-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/constant-language.adoc
@@ -9,6 +9,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/constant.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
index 726e139..b170fe3 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
@@ -9,6 +9,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/csimple.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/exchangeProperty-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/exchangeProperty-language.adoc
index a9cb933..ef65e95 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/exchangeProperty-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/exchangeProperty-language.adoc
@@ -9,6 +9,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/exchangeProperty.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/file-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/file-language.adoc
index 7ec32f8..43181ba 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/file-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/file-language.adoc
@@ -9,6 +9,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/file.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/header-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/header-language.adoc
index 2c0b9f0..f305b72 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/header-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/header-language.adoc
@@ -9,6 +9,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/header.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/ref-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/ref-language.adoc
index 950ff6c..4841b26 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/ref-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/ref-language.adoc
@@ -9,6 +9,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/ref.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
[camel] 04/04: copies of core language docs with new attributes
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f7b6f90fe28151376076ca68417d38ed8a5ab3f1
Author: David Jencks
AuthorDate: Wed Oct 13 16:52:38 2021 -0700
copies of core language docs with new attributes
---
.../resources/org/apache/camel/catalog/docs/constant-language.adoc | 1 +
.../resources/org/apache/camel/catalog/docs/csimple-language.adoc| 1 +
.../org/apache/camel/catalog/docs/exchangeProperty-language.adoc | 1 +
.../generated/resources/org/apache/camel/catalog/docs/file-language.adoc | 1 +
.../resources/org/apache/camel/catalog/docs/header-language.adoc | 1 +
.../generated/resources/org/apache/camel/catalog/docs/ref-language.adoc | 1 +
.../resources/org/apache/camel/catalog/docs/simple-language.adoc | 1 +
.../resources/org/apache/camel/catalog/docs/tokenize-language.adoc | 1 +
docs/components/modules/languages/pages/constant-language.adoc | 1 +
docs/components/modules/languages/pages/csimple-language.adoc| 1 +
docs/components/modules/languages/pages/exchangeProperty-language.adoc | 1 +
docs/components/modules/languages/pages/file-language.adoc | 1 +
docs/components/modules/languages/pages/header-language.adoc | 1 +
docs/components/modules/languages/pages/ref-language.adoc| 1 +
docs/components/modules/languages/pages/simple-language.adoc | 1 +
docs/components/modules/languages/pages/tokenize-language.adoc | 1 +
16 files changed, 16 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/constant-language.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/constant-language.adoc
index 10691b7..a9ac95d 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/constant-language.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/constant-language.adoc
@@ -9,6 +9,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/constant.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/csimple-language.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/csimple-language.adoc
index 726e139..b170fe3 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/csimple-language.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/csimple-language.adoc
@@ -9,6 +9,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/csimple.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/exchangeProperty-language.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/exchangeProperty-language.adoc
index a9cb933..ef65e95 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/exchangeProperty-language.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/exchangeProperty-language.adoc
@@ -9,6 +9,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/exchangeProperty.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/file-language.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/file-language.adoc
index 7ec32f8..43181ba 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/file-language.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/file-language.adoc
@@ -9,6 +9,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/file.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/header-language.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/header-language.adoc
index 2c0b9f0..f305b72 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/header-language.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/header-language.adoc
@@ -9,6 +9,7 @@
[camel] 01/04: set up moving new manual attributes to header in UpdateReadmeMojo
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d41c71066e64cd1f7bfd5e91d40ddb4a2a94b917
Author: David Jencks
AuthorDate: Sat Oct 9 16:00:29 2021 -0700
set up moving new manual attributes to header in UpdateReadmeMojo
add shortname to header attributes (tooling)
---
.../camel/maven/packaging/UpdateReadmeMojo.java| 34 +-
1 file changed, 27 insertions(+), 7 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
index 580a1c5..493bbd1 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
@@ -69,15 +69,22 @@ import org.sonatype.plexus.build.incremental.BuildContext;
import static org.apache.camel.tooling.util.PackageHelper.findCamelDirectory;
/**
- * Generate or updates the component/dataformat/language/eip readme.md and
.adoc files in the project root directory.
+ * Generate or updates the component/dataformat/language/eip documentation
.adoc files in the project src/main/docs
+ * directory.
*/
@Mojo(name = "update-readme", threadSafe = true)
public class UpdateReadmeMojo extends AbstractGeneratorMojo {
+//Set to true if you need to move a new manual attribute from text body to
header attributes.
+private static final boolean RELOCATE_MANUAL_ATTRIBUTES = false;
+
//Header attributes that are preserved through header generation
private static final Pattern[] MANUAL_ATTRIBUTES = {
Pattern.compile(":(group): *(.*)"),
-Pattern.compile(":(summary-group): *(.*)") };
+Pattern.compile(":(summary-group): *(.*)"),
+Pattern.compile(":(camel-spring-boot-name): *(.*)"),
+Pattern.compile(":(starter-artifactid): *(.*)")
+};
/**
* The project build directory
@@ -633,7 +640,7 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo
{
// find manual attributes
Map manualAttributes = new LinkedHashMap<>();
for (String line : lines) {
-if (line.length() == 0) {
+if (!RELOCATE_MANUAL_ATTRIBUTES && line.length() == 0) {
break;
}
for (Pattern attrName : MANUAL_ATTRIBUTES) {
@@ -657,6 +664,8 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo
{
}
newLines.add("= " + title);
newLines.add(":docTitle: " + model.getTitle());
+String shortName = "mail".equals(name) ? "imap" : name;
+newLines.add(":shortname: " + shortName);
if (model instanceof ArtifactModel) {
newLines.add(":artifactId: " + ((ArtifactModel)
model).getArtifactId());
@@ -702,12 +711,23 @@ public class UpdateReadmeMojo extends
AbstractGeneratorMojo {
}
boolean copy = false;
-if (updated) {
-for (int i = 0; i < lines.length; i++) {
-if (!copy && lines[i].isEmpty()) {
+if (updated || RELOCATE_MANUAL_ATTRIBUTES) {
+outer: for (String line : lines) {
+if (!copy && line.isEmpty()) {
copy = true;
} else if (copy) {
-newLines.add(lines[i]);
+
+if (RELOCATE_MANUAL_ATTRIBUTES) {
+for (Pattern attrName : MANUAL_ATTRIBUTES) {
+Matcher m = attrName.matcher(line);
+if (m.matches()) {
+updated = true;
+continue outer;
+}
+}
+}
+
+newLines.add(line);
}
}
if (!copy) {
[camel] branch camel-3.11.x updated (5917495 -> f7b6f90)
This is an automated email from the ASF dual-hosted git repository. djencks pushed a change to branch camel-3.11.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 5917495 CAMEL-17073: Fixed simple language caching bug. new d41c710 set up moving new manual attributes to header in UpdateReadmeMojo new 0e21311 switch to starter template include new 2ec43a7 add explicit starter-artifactid to core languages new f7b6f90 copies of core language docs with new attributes The 4 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-dependencies/pom.xml | 21 +- .../camel/catalog/archetypes/archetype-catalog.xml | 16 +- .../apache/camel/catalog/components/github.json| 4 +- .../camel/catalog/components/google-pubsub.json| 10 +- .../camel/catalog/components/salesforce.json | 4 +- .../camel/catalog/docs/activemq-component.adoc | 6 +- .../apache/camel/catalog/docs/ahc-component.adoc | 6 +- .../camel/catalog/docs/ahc-ws-component.adoc | 6 +- .../apache/camel/catalog/docs/amqp-component.adoc | 6 +- .../camel/catalog/docs/any23-dataformat.adoc | 6 +- .../camel/catalog/docs/arangodb-component.adoc | 6 +- .../apache/camel/catalog/docs/as2-component.adoc | 6 +- .../apache/camel/catalog/docs/asn1-dataformat.adoc | 6 +- .../camel/catalog/docs/asterisk-component.adoc | 6 +- .../camel/catalog/docs/atlasmap-component.adoc | 17 +- .../apache/camel/catalog/docs/atmos-component.adoc | 6 +- .../docs/atmosphere-websocket-component.adoc | 7 +- .../apache/camel/catalog/docs/atom-component.adoc | 5 +- .../camel/catalog/docs/atomix-map-component.adoc | 6 +- .../catalog/docs/atomix-messaging-component.adoc | 6 +- .../catalog/docs/atomix-multimap-component.adoc| 6 +- .../camel/catalog/docs/atomix-queue-component.adoc | 6 +- .../camel/catalog/docs/atomix-set-component.adoc | 6 +- .../camel/catalog/docs/atomix-value-component.adoc | 6 +- .../org/apache/camel/catalog/docs/attachments.adoc | 1 + .../apache/camel/catalog/docs/avro-component.adoc | 6 +- .../apache/camel/catalog/docs/avro-dataformat.adoc | 6 +- .../catalog/docs/avro-jackson-dataformat.adoc | 5 + .../docs/aws-secrets-manager-component.adoc| 5 +- .../org/apache/camel/catalog/docs/aws-xray.adoc| 5 + .../camel/catalog/docs/aws2-athena-component.adoc | 5 +- .../camel/catalog/docs/aws2-cw-component.adoc | 5 +- .../camel/catalog/docs/aws2-ddb-component.adoc | 5 +- .../catalog/docs/aws2-ddbstream-component.adoc | 5 +- .../camel/catalog/docs/aws2-ec2-component.adoc | 5 +- .../camel/catalog/docs/aws2-ecs-component.adoc | 5 +- .../camel/catalog/docs/aws2-eks-component.adoc | 5 +- .../catalog/docs/aws2-eventbridge-component.adoc | 5 +- .../camel/catalog/docs/aws2-iam-component.adoc | 5 +- .../camel/catalog/docs/aws2-kinesis-component.adoc | 5 +- .../docs/aws2-kinesis-firehose-component.adoc | 5 +- .../camel/catalog/docs/aws2-kms-component.adoc | 5 +- .../camel/catalog/docs/aws2-lambda-component.adoc | 5 +- .../camel/catalog/docs/aws2-mq-component.adoc | 5 +- .../camel/catalog/docs/aws2-msk-component.adoc | 5 +- .../camel/catalog/docs/aws2-s3-component.adoc | 5 +- .../camel/catalog/docs/aws2-ses-component.adoc | 5 +- .../camel/catalog/docs/aws2-sns-component.adoc | 5 +- .../camel/catalog/docs/aws2-sqs-component.adoc | 5 +- .../camel/catalog/docs/aws2-sts-component.adoc | 5 +- .../catalog/docs/aws2-translate-component.adoc | 5 +- .../catalog/docs/azure-cosmosdb-component.adoc | 5 +- .../catalog/docs/azure-eventhubs-component.adoc| 5 +- .../catalog/docs/azure-storage-blob-component.adoc | 5 +- .../docs/azure-storage-datalake-component.adoc | 4 + .../docs/azure-storage-queue-component.adoc| 5 +- .../camel/catalog/docs/barcode-dataformat.adoc | 6 +- .../camel/catalog/docs/base64-dataformat.adoc | 6 +- .../apache/camel/catalog/docs/bean-component.adoc | 6 +- .../apache/camel/catalog/docs/bean-language.adoc | 6 +- .../catalog/docs/bean-validator-component.adoc | 7 +- .../camel/catalog/docs/beanio-dataformat.adoc | 6 +- .../camel/catalog/docs/beanstalk-component.adoc| 6 +- .../camel/catalog/docs/bindy-dataformat.adoc | 6 +- .../camel/catalog/docs/bonita-component.adoc | 6 +- .../apache/camel/catalog/docs/box-component.adoc | 6 +- .../camel/catalog/docs/braintree-component.adoc| 6 +- .../camel/catalog/docs/browse-component.adoc | 6 +- .../catalog/docs/caffeine-cache-component.adoc | 6 +-
[camel] 01/04: Use util boldLink method to construct cell links
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-3.12.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 06bf7a9516babf470d774c791c03ffbebc149715
Author: David Jencks
AuthorDate: Sat Oct 9 00:22:38 2021 -0700
Use util boldLink method to construct cell links
---
.../modules/ROOT/partials/component-endpoint-options.adoc| 12 +---
.../modules/dataformats/partials/dataformat-options.adoc | 7 +++
.../modules/languages/partials/language-options.adoc | 7 +++
3 files changed, 11 insertions(+), 15 deletions(-)
diff --git
a/docs/components/modules/ROOT/partials/component-endpoint-options.adoc
b/docs/components/modules/ROOT/partials/component-endpoint-options.adoc
index eb2df35..c5ab330 100644
--- a/docs/components/modules/ROOT/partials/component-endpoint-options.adoc
+++ b/docs/components/modules/ROOT/partials/component-endpoint-options.adoc
@@ -1,14 +1,12 @@
//component options: START
-:tablespec: width="100%",cols="2,5a,^1,2",options="header"
-:base-option-name: ${path[2]}]*${path[2]}* (${value.group})`
-:component-option-name: `[#_component_option_{base-option-name}
-:endpoint-path-option-name: `[#_endpoint_path_option_{base-option-name}
-:endpoint-query-option-name: `[#_endpoint_query_option_{base-option-name}
+:tablespec: width="100%",cols="2a,5a,^1,2",options="header"
+:component-option-name: util.boldLink(path[2], "component_option", value.group)
+:endpoint-path-option-name: util.boldLink(path[2], "endpoint_path_option",
value.group)
+:endpoint-query-option-name: util.boldLink(path[2], "endpoint_query_option",
value.group)
:last-cell-formats: |util.description(value) \
-|value.defaultValue ? `${value.defaultValue}` : "" \
+|util.defaultValue(value.defaultValue) \
|util.javaSimpleName(value.javaType)
-:requires: 'util=util/jsonpath-util.js'
include::jsonpath$example$json/{shortname}.json[query='$.component',formats='name,scheme,pascalcasescheme=util.pascalCase(scheme),syntax,apiSyntax',
requires={requires}]
include::jsonpathcount$example$json/{shortname}.json[queries='pathparametercount=nodes$.properties[?(@.kind=="path")],queryparametercount=nodes$.properties[?(@.kind=="parameter")],apicount=nodes$.apis.*']
diff --git
a/docs/components/modules/dataformats/partials/dataformat-options.adoc
b/docs/components/modules/dataformats/partials/dataformat-options.adoc
index 29f84ad..8c284a0 100644
--- a/docs/components/modules/dataformats/partials/dataformat-options.adoc
+++ b/docs/components/modules/dataformats/partials/dataformat-options.adoc
@@ -1,9 +1,8 @@
-:tablespec: width="100%",cols="2,1m,1m,6a",options="header"
-:cellformats: '` [#_option_${path[2]}]*${path[2]}* ` \
-| value.defaultValue ? `${value.defaultValue}` : "" \
+:tablespec: width="100%",cols="2a,1m,1m,6a",options="header"
+:cellformats: 'util.boldLink(path[2], "dataformat_option", value.group) \
+|util.defaultValue(value.defaultValue) \
|util.pascalCase(value.type) \
|util.description(value)'
-:requires: 'util=util/jsonpath-util.js'
include::jsonpathcount$example$json/{shortname}.json[queries='optioncount=nodes$.properties[?(@.displayName!="Id")]']
ifeval::[{optioncount} == 0]
diff --git a/docs/components/modules/languages/partials/language-options.adoc
b/docs/components/modules/languages/partials/language-options.adoc
index 9b74ec7..29bf0cc 100644
--- a/docs/components/modules/languages/partials/language-options.adoc
+++ b/docs/components/modules/languages/partials/language-options.adoc
@@ -1,9 +1,8 @@
-:tablespec: width="100%",cols="2,1m,1m,6a",options="header"
-:cellformats: '`[#_option_${path[2]}]*${path[2]}*` \
-| value.defaultValue ? `${value.defaultValue}` : "" \
+:tablespec: width="100%",cols="2a,1m,1m,6a",options="header"
+:cellformats: 'util.boldLink(path[2], "language_option", value.group) \
+|util.defaultValue(value.defaultValue) \
|util.pascalCase(value.type) \
|util.description(value)'
-:requires: 'util=util/jsonpath-util.js'
include::jsonpathcount$example$json/{shortname}.json[queries='optioncount=nodes$.properties[?(@.kind=="attribute"
&& @.displayName!="Id")]']
ifeval::[{optioncount} == 0]
[camel] 04/04: add explicit starter-artifactid to core languages
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-3.12.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 20334d4fa2b28f3b96b79afcb33a661caff5275d
Author: David Jencks
AuthorDate: Wed Oct 13 12:59:59 2021 -0700
add explicit starter-artifactid to core languages
---
.../src/main/docs/modules/languages/pages/constant-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/csimple-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/exchangeProperty-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/file-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/header-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/ref-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/simple-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/tokenize-language.adoc | 1 +
8 files changed, 8 insertions(+)
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/constant-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/constant-language.adoc
index 8f295a7..fcd46cc 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/constant-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/constant-language.adoc
@@ -8,6 +8,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/constant.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
index 20f1183..7418cd0 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
@@ -8,6 +8,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/csimple.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/exchangeProperty-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/exchangeProperty-language.adoc
index 468cb96..6c72259 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/exchangeProperty-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/exchangeProperty-language.adoc
@@ -8,6 +8,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/exchangeProperty.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/file-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/file-language.adoc
index 0dd05ad..8dbea41 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/file-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/file-language.adoc
@@ -8,6 +8,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/file.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/header-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/header-language.adoc
index 6fa9bcd..d6b7e3e 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/header-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/header-language.adoc
@@ -8,6 +8,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/header.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/ref-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/ref-language.adoc
index 87eb9a3..32199d4 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/ref-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/ref-language.adoc
@@ -8,6 +8,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/ref.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
[camel] 02/04: set up moving new manual attributes to header in UpdateReadmeMojo
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-3.12.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3716f5e0347bf0e222b1c7946bbea970b6f24ba9
Author: David Jencks
AuthorDate: Sat Oct 9 16:00:29 2021 -0700
set up moving new manual attributes to header in UpdateReadmeMojo
add starter-artifactid to manual attributes
---
.../camel/maven/packaging/UpdateReadmeMojo.java| 32 +-
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
index b25adbb..59dad536 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
@@ -67,15 +67,22 @@ import org.sonatype.plexus.build.incremental.BuildContext;
import static org.apache.camel.tooling.util.PackageHelper.findCamelDirectory;
/**
- * Generate or updates the component/dataformat/language/eip readme.md and
.adoc files in the project root directory.
+ * Generate or updates the component/dataformat/language/eip documentation
.adoc files in the project src/main/docs
+ * directory.
*/
@Mojo(name = "update-readme", threadSafe = true)
public class UpdateReadmeMojo extends AbstractGeneratorMojo {
+//Set to true if you need to move a new manual attribute from text body to
header attributes.
+private static final boolean RELOCATE_MANUAL_ATTRIBUTES = false;
+
//Header attributes that are preserved through header generation
private static final Pattern[] MANUAL_ATTRIBUTES = {
Pattern.compile(":(group): *(.*)"),
-Pattern.compile(":(summary-group): *(.*)") };
+Pattern.compile(":(summary-group): *(.*)"),
+Pattern.compile(":(camel-spring-boot-name): *(.*)"),
+Pattern.compile(":(starter-artifactid): *(.*)")
+};
/**
* The project build directory
@@ -457,7 +464,7 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo
{
// find manual attributes
Map manualAttributes = new LinkedHashMap<>();
for (String line : lines) {
-if (line.length() == 0) {
+if (!RELOCATE_MANUAL_ATTRIBUTES && line.length() == 0) {
break;
}
for (Pattern attrName : MANUAL_ATTRIBUTES) {
@@ -525,12 +532,23 @@ public class UpdateReadmeMojo extends
AbstractGeneratorMojo {
}
boolean copy = false;
-if (updated) {
-for (int i = 0; i < lines.length; i++) {
-if (!copy && lines[i].isEmpty()) {
+if (updated || RELOCATE_MANUAL_ATTRIBUTES) {
+outer: for (String line : lines) {
+if (!copy && line.isEmpty()) {
copy = true;
} else if (copy) {
-newLines.add(lines[i]);
+
+if (RELOCATE_MANUAL_ATTRIBUTES) {
+for (Pattern attrName : MANUAL_ATTRIBUTES) {
+Matcher m = attrName.matcher(line);
+if (m.matches()) {
+updated = true;
+continue outer;
+}
+}
+}
+
+newLines.add(line);
}
}
if (!copy) {
[camel] branch camel-3.12.x updated (fb62129 -> 20334d4)
This is an automated email from the ASF dual-hosted git repository. djencks pushed a change to branch camel-3.12.x in repository https://gitbox.apache.org/repos/asf/camel.git. from fb62129 new spring-boot-partial coordinates new 06bf7a9 Use util boldLink method to construct cell links new 3716f5e set up moving new manual attributes to header in UpdateReadmeMojo new aec958d switch to starter template include new 20334d4 add explicit starter-artifactid to core languages The 4 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: .../src/main/docs/activemq-component.adoc | 5 +++- .../src/main/docs/ahc-ws-component.adoc| 5 +++- .../camel-ahc/src/main/docs/ahc-component.adoc | 5 +++- .../camel-amqp/src/main/docs/amqp-component.adoc | 5 +++- .../src/main/docs/any23-dataformat.adoc| 5 +++- .../src/main/docs/arangodb-component.adoc | 5 +++- .../src/main/docs/as2-component.adoc | 5 +++- .../camel-asn1/src/main/docs/asn1-dataformat.adoc | 5 +++- .../src/main/docs/asterisk-component.adoc | 5 +++- .../src/main/docs/atlasmap-component.adoc | 5 +++- .../camel-atmos/src/main/docs/atmos-component.adoc | 5 +++- .../main/docs/atmosphere-websocket-component.adoc | 5 +++- .../camel-atom/src/main/docs/atom-component.adoc | 5 +++- .../src/main/docs/atomix-map-component.adoc| 5 +++- .../src/main/docs/atomix-messaging-component.adoc | 5 +++- .../src/main/docs/atomix-multimap-component.adoc | 5 +++- .../src/main/docs/atomix-queue-component.adoc | 5 +++- .../src/main/docs/atomix-set-component.adoc| 5 +++- .../src/main/docs/atomix-value-component.adoc | 5 +++- .../src/main/docs/avro-component.adoc | 5 +++- .../camel-avro/src/main/docs/avro-dataformat.adoc | 5 +++- .../main/docs/aws-secrets-manager-component.adoc | 4 ++- .../camel-aws-xray/src/main/docs/aws-xray.adoc | 8 -- .../src/main/docs/aws2-athena-component.adoc | 4 ++- .../src/main/docs/aws2-cw-component.adoc | 4 ++- .../src/main/docs/aws2-ddb-component.adoc | 4 ++- .../src/main/docs/aws2-ddbstream-component.adoc| 4 ++- .../src/main/docs/aws2-ec2-component.adoc | 4 ++- .../src/main/docs/aws2-ecs-component.adoc | 4 ++- .../src/main/docs/aws2-eks-component.adoc | 4 ++- .../src/main/docs/aws2-eventbridge-component.adoc | 4 ++- .../src/main/docs/aws2-iam-component.adoc | 4 ++- .../src/main/docs/aws2-kinesis-component.adoc | 4 ++- .../main/docs/aws2-kinesis-firehose-component.adoc | 4 ++- .../src/main/docs/aws2-kms-component.adoc | 4 ++- .../src/main/docs/aws2-lambda-component.adoc | 4 ++- .../src/main/docs/aws2-mq-component.adoc | 4 ++- .../src/main/docs/aws2-msk-component.adoc | 4 ++- .../src/main/docs/aws2-s3-component.adoc | 4 ++- .../src/main/docs/aws2-ses-component.adoc | 4 ++- .../src/main/docs/aws2-sns-component.adoc | 4 ++- .../src/main/docs/aws2-sqs-component.adoc | 4 ++- .../src/main/docs/aws2-sts-component.adoc | 4 ++- .../src/main/docs/aws2-translate-component.adoc| 4 ++- .../src/main/docs/azure-cosmosdb-component.adoc| 4 ++- .../src/main/docs/azure-eventhubs-component.adoc | 4 ++- .../src/main/docs/azure-servicebus-component.adoc | 4 ++- .../main/docs/azure-storage-blob-component.adoc| 4 ++- .../docs/azure-storage-datalake-component.adoc | 3 ++ .../main/docs/azure-storage-queue-component.adoc | 4 ++- .../src/main/docs/barcode-dataformat.adoc | 5 +++- .../src/main/docs/base64-dataformat.adoc | 5 +++- .../src/main/docs/bean-validator-component.adoc| 5 +++- .../camel-bean/src/main/docs/bean-component.adoc | 5 +++- .../camel-bean/src/main/docs/bean-language.adoc| 5 +++- .../camel-bean/src/main/docs/class-component.adoc | 5 +++- .../src/main/docs/beanio-dataformat.adoc | 5 +++- .../src/main/docs/beanstalk-component.adoc | 5 +++- .../src/main/docs/bindy-dataformat.adoc| 5 +++- .../src/main/docs/bonita-component.adoc| 5 +++- .../src/main/docs/box-component.adoc | 5 +++- .../src/main/docs/braintree-component.adoc | 5 +++- .../src/main/docs/browse-component.adoc| 5 +++- .../src/main/docs/caffeine-lrucache.adoc | 9 +++--- .../src/main/docs/caffeine-cache-component.adoc| 5 +++- .../main/docs/caffeine-loadcache-component.adoc| 5 +++- .../src/main/docs/cql-component.adoc | 5 +++- .../camel-cbor/src/main/docs/cbor-dataformat.adoc | 5 +++- .../src/main/docs/chatscript-component.adoc
[camel] 05/05: docs copies of core language docs with new attributes
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a9b61d151a3b052742bd3fd1c7ccf467bcd629d2
Author: David Jencks
AuthorDate: Wed Oct 13 17:46:15 2021 -0700
docs copies of core language docs with new attributes
regenerate catalog adocs
---
.../generated/resources/org/apache/camel/catalog/docs/aws-xray.adoc | 4
.../resources/org/apache/camel/catalog/docs/azure-summary.adoc | 5 +
.../resources/org/apache/camel/catalog/docs/constant-language.adoc | 5 +
.../resources/org/apache/camel/catalog/docs/csimple-joor.adoc | 4
.../resources/org/apache/camel/catalog/docs/csimple-language.adoc | 5 +
.../resources/org/apache/camel/catalog/docs/cxf-transport.adoc | 4
.../org/apache/camel/catalog/docs/datasonnet-language.adoc | 4
.../resources/org/apache/camel/catalog/docs/djl-component.adoc | 4
.../generated/resources/org/apache/camel/catalog/docs/etcd3.adoc| 4
.../org/apache/camel/catalog/docs/exchangeProperty-language.adoc| 5 +
.../org/apache/camel/catalog/docs/fhirJson-dataformat.adoc | 4
.../resources/org/apache/camel/catalog/docs/fhirXml-dataformat.adoc | 4
.../resources/org/apache/camel/catalog/docs/file-language.adoc | 5 +
.../resources/org/apache/camel/catalog/docs/hazelcast-summary.adoc | 5 +++--
.../resources/org/apache/camel/catalog/docs/header-language.adoc| 5 +
.../resources/org/apache/camel/catalog/docs/ignite-summary.adoc | 6 +++---
.../generated/resources/org/apache/camel/catalog/docs/jasypt.adoc | 4
.../resources/org/apache/camel/catalog/docs/joor-language.adoc | 4
.../resources/org/apache/camel/catalog/docs/kubernetes-summary.adoc | 5 +++--
.../resources/org/apache/camel/catalog/docs/leveldb-legacy.adoc | 4
.../generated/resources/org/apache/camel/catalog/docs/leveldb.adoc | 4
.../resources/org/apache/camel/catalog/docs/oaipmh-component.adoc | 4
.../resources/org/apache/camel/catalog/docs/openapi-java.adoc | 4
.../resources/org/apache/camel/catalog/docs/openstack-summary.adoc | 6 +++---
.../generated/resources/org/apache/camel/catalog/docs/reactor.adoc | 4
.../resources/org/apache/camel/catalog/docs/ref-language.adoc | 5 +
.../resources/org/apache/camel/catalog/docs/resilience4j.adoc | 4
.../generated/resources/org/apache/camel/catalog/docs/ribbon.adoc | 4
.../generated/resources/org/apache/camel/catalog/docs/rxjava.adoc | 4
.../generated/resources/org/apache/camel/catalog/docs/shiro.adoc| 4
.../resources/org/apache/camel/catalog/docs/simple-language.adoc| 5 +
.../resources/org/apache/camel/catalog/docs/spring-javaconfig.adoc | 3 +++
.../resources/org/apache/camel/catalog/docs/spring-security.adoc| 3 +++
.../resources/org/apache/camel/catalog/docs/spring-summary.adoc | 5 +++--
.../resources/org/apache/camel/catalog/docs/swagger-java.adoc | 4
.../resources/org/apache/camel/catalog/docs/tokenize-language.adoc | 5 +
.../org/apache/camel/catalog/docs/undertow-spring-security.adoc | 4
.../resources/org/apache/camel/catalog/docs/xtokenize-language.adoc | 4
docs/components/modules/languages/pages/constant-language.adoc | 1 +
docs/components/modules/languages/pages/csimple-language.adoc | 1 +
.../modules/languages/pages/exchangeProperty-language.adoc | 1 +
docs/components/modules/languages/pages/file-language.adoc | 1 +
docs/components/modules/languages/pages/header-language.adoc| 1 +
docs/components/modules/languages/pages/ref-language.adoc | 1 +
docs/components/modules/languages/pages/simple-language.adoc| 1 +
docs/components/modules/languages/pages/tokenize-language.adoc | 1 +
46 files changed, 158 insertions(+), 16 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws-xray.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws-xray.adoc
index e3b4eaf..00a853d 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws-xray.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws-xray.adoc
@@ -7,6 +7,8 @@
:since: 2.21
:supportLevel: Stable
include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/aws-xray.adoc[opts=optional]
+//Manually maintained attributes
+:camel-spring-boot-name: aws-xray
*Since Camel {since}*
@@ -120,3 +122,5 @@ Note that the AWS XRay `Entity` (i.e., `Segment` and
`Subsegment`) are not seria
== Example
You can find an example demonstrating the way to configure AWS XRay tracing
within the tests accompanying this project.
+
+include::spring-boot:partial$starter.adoc[]
diff --git
[camel] 04/05: add explicit starter-artifactid to core languages
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 25467ee4a2bcdb1e8729fd89a5869ca6a9db3c2d
Author: David Jencks
AuthorDate: Wed Oct 13 12:59:59 2021 -0700
add explicit starter-artifactid to core languages
---
.../src/main/docs/modules/languages/pages/constant-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/csimple-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/exchangeProperty-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/file-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/header-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/ref-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/simple-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/tokenize-language.adoc | 1 +
8 files changed, 8 insertions(+)
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/constant-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/constant-language.adoc
index 10691b7..a9ac95d 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/constant-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/constant-language.adoc
@@ -9,6 +9,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/constant.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
index 006f417..be8c659 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
@@ -9,6 +9,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/csimple.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/exchangeProperty-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/exchangeProperty-language.adoc
index a9cb933..ef65e95 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/exchangeProperty-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/exchangeProperty-language.adoc
@@ -9,6 +9,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/exchangeProperty.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/file-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/file-language.adoc
index 7ec32f8..43181ba 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/file-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/file-language.adoc
@@ -9,6 +9,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/file.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/header-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/header-language.adoc
index d0a6129..752d153 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/header-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/header-language.adoc
@@ -9,6 +9,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/header.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/ref-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/ref-language.adoc
index 950ff6c..4841b26 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/ref-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/ref-language.adoc
@@ -9,6 +9,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/ref.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
[camel] 02/05: fix broken gulpfile
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 18ffbc38a6dd0b39971558bbca18516510a25118
Author: David Jencks
AuthorDate: Tue Oct 12 13:40:18 2021 -0700
fix broken gulpfile
---
docs/gulpfile.js | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/docs/gulpfile.js b/docs/gulpfile.js
index 40af5ad..49e4522 100644
--- a/docs/gulpfile.js
+++ b/docs/gulpfile.js
@@ -133,7 +133,11 @@ function createComponentDataFormatSymlinks () {
function createComponentLanguageSymlinks () {
return (
-src(['../components/{*,*/*}/src/main/docs/*-language.adoc'])
+src([
+ '../components/{*,*/*}/src/main/docs/*-language.adoc',
+
'../core/camel-core-languages/src/main/docs/modules/languages/pages/*-language.adoc',
+
'../core/camel-xml-jaxp/src/main/docs/modules/languages/pages/*-language.adoc',
+])
.pipe(
map((file, done) => {
// this flattens the output to just .../pages/adoc
[camel] branch camel-3.7.x updated (72ebeb8 -> a9b61d1)
This is an automated email from the ASF dual-hosted git repository. djencks pushed a change to branch camel-3.7.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 72ebeb8 CAMEL-17073: Fixed simple language caching bug. new 03f90df set up moving new manual attributes to header in UpdateReadmeMojo new 18ffbc3 fix broken gulpfile new 1201f83 switch to starter template include new 25467ee add explicit starter-artifactid to core languages new a9b61d1 docs copies of core language docs with new attributes The 5 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-dependencies/pom.xml | 25 +- .../camel/catalog/archetypes/archetype-catalog.xml | 16 +- .../camel/catalog/docs/activemq-component.adoc | 6 +- .../apache/camel/catalog/docs/ahc-component.adoc | 6 +- .../camel/catalog/docs/ahc-ws-component.adoc | 6 +- .../apache/camel/catalog/docs/amqp-component.adoc | 6 +- .../camel/catalog/docs/any23-dataformat.adoc | 6 +- .../apache/camel/catalog/docs/apns-component.adoc | 6 +- .../camel/catalog/docs/arangodb-component.adoc | 6 +- .../apache/camel/catalog/docs/as2-component.adoc | 6 +- .../apache/camel/catalog/docs/asn1-dataformat.adoc | 6 +- .../camel/catalog/docs/asterisk-component.adoc | 6 +- .../camel/catalog/docs/atlasmap-component.adoc | 6 +- .../apache/camel/catalog/docs/atmos-component.adoc | 6 +- .../docs/atmosphere-websocket-component.adoc | 6 +- .../apache/camel/catalog/docs/atom-component.adoc | 6 +- .../camel/catalog/docs/atomix-map-component.adoc | 6 +- .../catalog/docs/atomix-messaging-component.adoc | 6 +- .../catalog/docs/atomix-multimap-component.adoc| 6 +- .../camel/catalog/docs/atomix-queue-component.adoc | 6 +- .../camel/catalog/docs/atomix-set-component.adoc | 6 +- .../camel/catalog/docs/atomix-value-component.adoc | 6 +- .../org/apache/camel/catalog/docs/attachments.adoc | 1 + .../apache/camel/catalog/docs/avro-component.adoc | 6 +- .../apache/camel/catalog/docs/avro-dataformat.adoc | 6 +- .../camel/catalog/docs/aws-cw-component.adoc | 5 +- .../camel/catalog/docs/aws-ddb-component.adoc | 5 +- .../catalog/docs/aws-ddbstream-component.adoc | 5 +- .../camel/catalog/docs/aws-ec2-component.adoc | 5 +- .../camel/catalog/docs/aws-ecs-component.adoc | 5 +- .../camel/catalog/docs/aws-eks-component.adoc | 5 +- .../camel/catalog/docs/aws-iam-component.adoc | 5 +- .../camel/catalog/docs/aws-kinesis-component.adoc | 5 +- .../docs/aws-kinesis-firehose-component.adoc | 5 +- .../camel/catalog/docs/aws-kms-component.adoc | 5 +- .../camel/catalog/docs/aws-lambda-component.adoc | 5 +- .../camel/catalog/docs/aws-mq-component.adoc | 5 +- .../camel/catalog/docs/aws-msk-component.adoc | 5 +- .../camel/catalog/docs/aws-s3-component.adoc | 5 +- .../camel/catalog/docs/aws-sdb-component.adoc | 5 +- .../camel/catalog/docs/aws-ses-component.adoc | 5 +- .../camel/catalog/docs/aws-sns-component.adoc | 5 +- .../camel/catalog/docs/aws-sqs-component.adoc | 5 +- .../camel/catalog/docs/aws-swf-component.adoc | 5 +- .../catalog/docs/aws-translate-component.adoc | 5 +- .../org/apache/camel/catalog/docs/aws-xray.adoc| 5 + .../camel/catalog/docs/aws2-athena-component.adoc | 5 +- .../camel/catalog/docs/aws2-cw-component.adoc | 5 +- .../camel/catalog/docs/aws2-ddb-component.adoc | 5 +- .../catalog/docs/aws2-ddbstream-component.adoc | 5 +- .../camel/catalog/docs/aws2-ec2-component.adoc | 5 +- .../camel/catalog/docs/aws2-ecs-component.adoc | 5 +- .../camel/catalog/docs/aws2-eks-component.adoc | 5 +- .../catalog/docs/aws2-eventbridge-component.adoc | 5 +- .../camel/catalog/docs/aws2-iam-component.adoc | 5 +- .../camel/catalog/docs/aws2-kinesis-component.adoc | 5 +- .../docs/aws2-kinesis-firehose-component.adoc | 5 +- .../camel/catalog/docs/aws2-kms-component.adoc | 5 +- .../camel/catalog/docs/aws2-lambda-component.adoc | 5 +- .../camel/catalog/docs/aws2-mq-component.adoc | 5 +- .../camel/catalog/docs/aws2-msk-component.adoc | 5 +- .../camel/catalog/docs/aws2-s3-component.adoc | 5 +- .../camel/catalog/docs/aws2-ses-component.adoc | 5 +- .../camel/catalog/docs/aws2-sns-component.adoc | 5 +- .../camel/catalog/docs/aws2-sqs-component.adoc | 5 +- .../camel/catalog/docs/aws2-sts-component.adoc | 5 +- .../catalog/docs/aws2-translate-component.adoc | 5 +- .../camel/catalog/docs/azure-blob-component.adoc | 5 +-
[camel] 01/05: set up moving new manual attributes to header in UpdateReadmeMojo
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 03f90dffd5d0a212c2c8071711522ef39e254345
Author: David Jencks
AuthorDate: Sat Oct 9 16:00:29 2021 -0700
set up moving new manual attributes to header in UpdateReadmeMojo
add shortname to header attributes (tooling)
add starter-artifactid to manual attributes
---
.../camel/maven/packaging/UpdateReadmeMojo.java| 34 +-
1 file changed, 27 insertions(+), 7 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
index 92ce6c2..9017d3f 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
@@ -58,15 +58,22 @@ import org.sonatype.plexus.build.incremental.BuildContext;
import static org.apache.camel.tooling.util.PackageHelper.findCamelDirectory;
/**
- * Generate or updates the component/dataformat/language/eip readme.md and
.adoc files in the project root directory.
+ * Generate or updates the component/dataformat/language/eip documentation
.adoc files in the project src/main/docs
+ * directory.
*/
@Mojo(name = "update-readme", threadSafe = true)
public class UpdateReadmeMojo extends AbstractGeneratorMojo {
+//Set to true if you need to move a new manual attribute from text body to
header attributes.
+private static final boolean RELOCATE_MANUAL_ATTRIBUTES = false;
+
//Header attributes that are preserved through header generation
private static final Pattern[] MANUAL_ATTRIBUTES = {
Pattern.compile(":(group): *(.*)"),
-Pattern.compile(":(summary-group): *(.*)") };
+Pattern.compile(":(summary-group): *(.*)"),
+Pattern.compile(":(camel-spring-boot-name): *(.*)"),
+Pattern.compile(":(starter-artifactid): *(.*)")
+};
/**
* The project build directory
@@ -613,7 +620,7 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo
{
// find manual attributes
Map manualAttributes = new LinkedHashMap<>();
for (String line : lines) {
-if (line.length() == 0) {
+if (!RELOCATE_MANUAL_ATTRIBUTES && line.length() == 0) {
break;
}
for (Pattern attrName : MANUAL_ATTRIBUTES) {
@@ -637,6 +644,8 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo
{
}
newLines.add("= " + title);
newLines.add(":docTitle: " + model.getTitle());
+String shortName = "mail".equals(name) ? "imap" : name;
+newLines.add(":shortname: " + shortName);
if (model instanceof ArtifactModel) {
newLines.add(":artifactId: " + ((ArtifactModel)
model).getArtifactId());
@@ -679,12 +688,23 @@ public class UpdateReadmeMojo extends
AbstractGeneratorMojo {
}
boolean copy = false;
-if (updated) {
-for (int i = 0; i < lines.length; i++) {
-if (!copy && lines[i].isEmpty()) {
+if (updated || RELOCATE_MANUAL_ATTRIBUTES) {
+outer: for (String line : lines) {
+if (!copy && line.isEmpty()) {
copy = true;
} else if (copy) {
-newLines.add(lines[i]);
+
+if (RELOCATE_MANUAL_ATTRIBUTES) {
+for (Pattern attrName : MANUAL_ATTRIBUTES) {
+Matcher m = attrName.matcher(line);
+if (m.matches()) {
+updated = true;
+continue outer;
+}
+}
+}
+
+newLines.add(line);
}
}
if (!copy) {
[GitHub] [camel-website] djencks merged pull request #644: WIP do not merge Camel spring boot jsonpath
djencks merged pull request #644: URL: https://github.com/apache/camel-website/pull/644 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 04/04: add explicit starter-artifactid to core languages
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7336e9f7d2f950ee05bc4a81a76614647f5e4086
Author: David Jencks
AuthorDate: Wed Oct 13 12:59:59 2021 -0700
add explicit starter-artifactid to core languages
---
.../src/main/docs/modules/languages/pages/constant-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/csimple-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/exchangeProperty-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/file-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/header-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/ref-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/simple-language.adoc | 1 +
.../src/main/docs/modules/languages/pages/tokenize-language.adoc | 1 +
8 files changed, 8 insertions(+)
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/constant-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/constant-language.adoc
index 8f295a7..fcd46cc 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/constant-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/constant-language.adoc
@@ -8,6 +8,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/constant.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
index 20f1183..7418cd0 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
@@ -8,6 +8,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/csimple.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/exchangeProperty-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/exchangeProperty-language.adoc
index 468cb96..6c72259 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/exchangeProperty-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/exchangeProperty-language.adoc
@@ -8,6 +8,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/exchangeProperty.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/file-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/file-language.adoc
index 0dd05ad..8dbea41 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/file-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/file-language.adoc
@@ -8,6 +8,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/file.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/header-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/header-language.adoc
index 6fa9bcd..d6b7e3e 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/header-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/header-language.adoc
@@ -8,6 +8,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/header.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/ref-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/ref-language.adoc
index 87eb9a3..32199d4 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/ref-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/ref-language.adoc
@@ -8,6 +8,7 @@
include::{cq-version}@camel-quarkus:ROOT:partial$reference/languages/ref.adoc[opts=optional]
//Manually maintained attributes
:camel-spring-boot-name: core
+:starter-artifactid: camel-core-starter
*Since Camel {since}*
diff --git
[camel] branch main updated (3830307 -> 7336e9f)
This is an automated email from the ASF dual-hosted git repository. djencks pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 3830307 CAMEL-17073: Fixed simple language caching bug. new 3ff771d Use util boldLink method to construct cell links new bdfd9ab set up moving new manual attributes to header in UpdateReadmeMojo new e9a3de2 switch to starter template include new 7336e9f add explicit starter-artifactid to core languages The 4 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: .../src/main/docs/activemq-component.adoc | 5 +++- .../src/main/docs/ahc-ws-component.adoc| 5 +++- .../camel-ahc/src/main/docs/ahc-component.adoc | 5 +++- .../camel-amqp/src/main/docs/amqp-component.adoc | 5 +++- .../src/main/docs/any23-dataformat.adoc| 5 +++- .../src/main/docs/arangodb-component.adoc | 5 +++- .../src/main/docs/as2-component.adoc | 5 +++- .../camel-asn1/src/main/docs/asn1-dataformat.adoc | 5 +++- .../src/main/docs/asterisk-component.adoc | 5 +++- .../src/main/docs/atlasmap-component.adoc | 5 +++- .../camel-atmos/src/main/docs/atmos-component.adoc | 5 +++- .../main/docs/atmosphere-websocket-component.adoc | 5 +++- .../camel-atom/src/main/docs/atom-component.adoc | 5 +++- .../src/main/docs/atomix-map-component.adoc| 5 +++- .../src/main/docs/atomix-messaging-component.adoc | 5 +++- .../src/main/docs/atomix-multimap-component.adoc | 5 +++- .../src/main/docs/atomix-queue-component.adoc | 5 +++- .../src/main/docs/atomix-set-component.adoc| 5 +++- .../src/main/docs/atomix-value-component.adoc | 5 +++- .../src/main/docs/avro-component.adoc | 5 +++- .../camel-avro/src/main/docs/avro-dataformat.adoc | 5 +++- .../main/docs/aws-secrets-manager-component.adoc | 4 ++- .../camel-aws-xray/src/main/docs/aws-xray.adoc | 8 -- .../src/main/docs/aws2-athena-component.adoc | 4 ++- .../src/main/docs/aws2-cw-component.adoc | 4 ++- .../src/main/docs/aws2-ddb-component.adoc | 4 ++- .../src/main/docs/aws2-ddbstream-component.adoc| 4 ++- .../src/main/docs/aws2-ec2-component.adoc | 4 ++- .../src/main/docs/aws2-ecs-component.adoc | 4 ++- .../src/main/docs/aws2-eks-component.adoc | 4 ++- .../src/main/docs/aws2-eventbridge-component.adoc | 4 ++- .../src/main/docs/aws2-iam-component.adoc | 4 ++- .../src/main/docs/aws2-kinesis-component.adoc | 4 ++- .../main/docs/aws2-kinesis-firehose-component.adoc | 4 ++- .../src/main/docs/aws2-kms-component.adoc | 4 ++- .../src/main/docs/aws2-lambda-component.adoc | 4 ++- .../src/main/docs/aws2-mq-component.adoc | 4 ++- .../src/main/docs/aws2-msk-component.adoc | 4 ++- .../src/main/docs/aws2-s3-component.adoc | 4 ++- .../src/main/docs/aws2-ses-component.adoc | 4 ++- .../src/main/docs/aws2-sns-component.adoc | 4 ++- .../src/main/docs/aws2-sqs-component.adoc | 4 ++- .../src/main/docs/aws2-sts-component.adoc | 4 ++- .../src/main/docs/aws2-translate-component.adoc| 4 ++- .../src/main/docs/azure-cosmosdb-component.adoc| 4 ++- .../src/main/docs/azure-eventhubs-component.adoc | 4 ++- .../src/main/docs/azure-servicebus-component.adoc | 4 ++- .../main/docs/azure-storage-blob-component.adoc| 4 ++- .../docs/azure-storage-datalake-component.adoc | 3 ++ .../main/docs/azure-storage-queue-component.adoc | 4 ++- .../src/main/docs/barcode-dataformat.adoc | 5 +++- .../src/main/docs/base64-dataformat.adoc | 5 +++- .../src/main/docs/bean-validator-component.adoc| 5 +++- .../camel-bean/src/main/docs/bean-component.adoc | 5 +++- .../camel-bean/src/main/docs/bean-language.adoc| 5 +++- .../camel-bean/src/main/docs/class-component.adoc | 5 +++- .../src/main/docs/beanio-dataformat.adoc | 5 +++- .../src/main/docs/beanstalk-component.adoc | 5 +++- .../src/main/docs/bindy-dataformat.adoc| 5 +++- .../src/main/docs/bonita-component.adoc| 5 +++- .../src/main/docs/box-component.adoc | 5 +++- .../src/main/docs/braintree-component.adoc | 5 +++- .../src/main/docs/browse-component.adoc| 5 +++- .../src/main/docs/caffeine-lrucache.adoc | 9 +++--- .../src/main/docs/caffeine-cache-component.adoc| 5 +++- .../main/docs/caffeine-loadcache-component.adoc| 5 +++- .../src/main/docs/cql-component.adoc | 5 +++- .../camel-cbor/src/main/docs/cbor-dataformat.adoc | 5 +++- .../src/main/docs/chatscript-component.adoc
[camel] 01/04: Use util boldLink method to construct cell links
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3ff771d5bd60e059135606477c6cbd7d8a43ed25
Author: David Jencks
AuthorDate: Sat Oct 9 00:22:38 2021 -0700
Use util boldLink method to construct cell links
---
.../modules/ROOT/partials/component-endpoint-options.adoc| 12 +---
.../modules/dataformats/partials/dataformat-options.adoc | 7 +++
.../modules/languages/partials/language-options.adoc | 7 +++
3 files changed, 11 insertions(+), 15 deletions(-)
diff --git
a/docs/components/modules/ROOT/partials/component-endpoint-options.adoc
b/docs/components/modules/ROOT/partials/component-endpoint-options.adoc
index eb2df35..c5ab330 100644
--- a/docs/components/modules/ROOT/partials/component-endpoint-options.adoc
+++ b/docs/components/modules/ROOT/partials/component-endpoint-options.adoc
@@ -1,14 +1,12 @@
//component options: START
-:tablespec: width="100%",cols="2,5a,^1,2",options="header"
-:base-option-name: ${path[2]}]*${path[2]}* (${value.group})`
-:component-option-name: `[#_component_option_{base-option-name}
-:endpoint-path-option-name: `[#_endpoint_path_option_{base-option-name}
-:endpoint-query-option-name: `[#_endpoint_query_option_{base-option-name}
+:tablespec: width="100%",cols="2a,5a,^1,2",options="header"
+:component-option-name: util.boldLink(path[2], "component_option", value.group)
+:endpoint-path-option-name: util.boldLink(path[2], "endpoint_path_option",
value.group)
+:endpoint-query-option-name: util.boldLink(path[2], "endpoint_query_option",
value.group)
:last-cell-formats: |util.description(value) \
-|value.defaultValue ? `${value.defaultValue}` : "" \
+|util.defaultValue(value.defaultValue) \
|util.javaSimpleName(value.javaType)
-:requires: 'util=util/jsonpath-util.js'
include::jsonpath$example$json/{shortname}.json[query='$.component',formats='name,scheme,pascalcasescheme=util.pascalCase(scheme),syntax,apiSyntax',
requires={requires}]
include::jsonpathcount$example$json/{shortname}.json[queries='pathparametercount=nodes$.properties[?(@.kind=="path")],queryparametercount=nodes$.properties[?(@.kind=="parameter")],apicount=nodes$.apis.*']
diff --git
a/docs/components/modules/dataformats/partials/dataformat-options.adoc
b/docs/components/modules/dataformats/partials/dataformat-options.adoc
index 29f84ad..8c284a0 100644
--- a/docs/components/modules/dataformats/partials/dataformat-options.adoc
+++ b/docs/components/modules/dataformats/partials/dataformat-options.adoc
@@ -1,9 +1,8 @@
-:tablespec: width="100%",cols="2,1m,1m,6a",options="header"
-:cellformats: '` [#_option_${path[2]}]*${path[2]}* ` \
-| value.defaultValue ? `${value.defaultValue}` : "" \
+:tablespec: width="100%",cols="2a,1m,1m,6a",options="header"
+:cellformats: 'util.boldLink(path[2], "dataformat_option", value.group) \
+|util.defaultValue(value.defaultValue) \
|util.pascalCase(value.type) \
|util.description(value)'
-:requires: 'util=util/jsonpath-util.js'
include::jsonpathcount$example$json/{shortname}.json[queries='optioncount=nodes$.properties[?(@.displayName!="Id")]']
ifeval::[{optioncount} == 0]
diff --git a/docs/components/modules/languages/partials/language-options.adoc
b/docs/components/modules/languages/partials/language-options.adoc
index 9b74ec7..29bf0cc 100644
--- a/docs/components/modules/languages/partials/language-options.adoc
+++ b/docs/components/modules/languages/partials/language-options.adoc
@@ -1,9 +1,8 @@
-:tablespec: width="100%",cols="2,1m,1m,6a",options="header"
-:cellformats: '`[#_option_${path[2]}]*${path[2]}*` \
-| value.defaultValue ? `${value.defaultValue}` : "" \
+:tablespec: width="100%",cols="2a,1m,1m,6a",options="header"
+:cellformats: 'util.boldLink(path[2], "language_option", value.group) \
+|util.defaultValue(value.defaultValue) \
|util.pascalCase(value.type) \
|util.description(value)'
-:requires: 'util=util/jsonpath-util.js'
include::jsonpathcount$example$json/{shortname}.json[queries='optioncount=nodes$.properties[?(@.kind=="attribute"
&& @.displayName!="Id")]']
ifeval::[{optioncount} == 0]
[camel] 02/04: set up moving new manual attributes to header in UpdateReadmeMojo
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bdfd9ab4096a2be76f28182d18c00134febd9370
Author: David Jencks
AuthorDate: Sat Oct 9 16:00:29 2021 -0700
set up moving new manual attributes to header in UpdateReadmeMojo
add starter-artifactid to manual attributes
---
.../camel/maven/packaging/UpdateReadmeMojo.java| 32 +-
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
index b25adbb..59dad536 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
@@ -67,15 +67,22 @@ import org.sonatype.plexus.build.incremental.BuildContext;
import static org.apache.camel.tooling.util.PackageHelper.findCamelDirectory;
/**
- * Generate or updates the component/dataformat/language/eip readme.md and
.adoc files in the project root directory.
+ * Generate or updates the component/dataformat/language/eip documentation
.adoc files in the project src/main/docs
+ * directory.
*/
@Mojo(name = "update-readme", threadSafe = true)
public class UpdateReadmeMojo extends AbstractGeneratorMojo {
+//Set to true if you need to move a new manual attribute from text body to
header attributes.
+private static final boolean RELOCATE_MANUAL_ATTRIBUTES = false;
+
//Header attributes that are preserved through header generation
private static final Pattern[] MANUAL_ATTRIBUTES = {
Pattern.compile(":(group): *(.*)"),
-Pattern.compile(":(summary-group): *(.*)") };
+Pattern.compile(":(summary-group): *(.*)"),
+Pattern.compile(":(camel-spring-boot-name): *(.*)"),
+Pattern.compile(":(starter-artifactid): *(.*)")
+};
/**
* The project build directory
@@ -457,7 +464,7 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo
{
// find manual attributes
Map manualAttributes = new LinkedHashMap<>();
for (String line : lines) {
-if (line.length() == 0) {
+if (!RELOCATE_MANUAL_ATTRIBUTES && line.length() == 0) {
break;
}
for (Pattern attrName : MANUAL_ATTRIBUTES) {
@@ -525,12 +532,23 @@ public class UpdateReadmeMojo extends
AbstractGeneratorMojo {
}
boolean copy = false;
-if (updated) {
-for (int i = 0; i < lines.length; i++) {
-if (!copy && lines[i].isEmpty()) {
+if (updated || RELOCATE_MANUAL_ATTRIBUTES) {
+outer: for (String line : lines) {
+if (!copy && line.isEmpty()) {
copy = true;
} else if (copy) {
-newLines.add(lines[i]);
+
+if (RELOCATE_MANUAL_ATTRIBUTES) {
+for (Pattern attrName : MANUAL_ATTRIBUTES) {
+Matcher m = attrName.matcher(line);
+if (m.matches()) {
+updated = true;
+continue outer;
+}
+}
+}
+
+newLines.add(line);
}
}
if (!copy) {
[GitHub] [camel-spring-boot] djencks merged pull request #388: Main jsonpath (please let me squash and merge)
djencks merged pull request #388: URL: https://github.com/apache/camel-spring-boot/pull/388 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] djencks merged pull request #387: Camel spring boot 3.12.x jsonpath (please let me squash and merge)
djencks merged pull request #387: URL: https://github.com/apache/camel-spring-boot/pull/387 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] djencks merged pull request #386: Camel spring boot 3.11.x jsonpath (please let me squash and merge)
djencks merged pull request #386: URL: https://github.com/apache/camel-spring-boot/pull/386 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] djencks merged pull request #385: Camel spring boot 3.7.x jsonpath (please let me squash and merge)
djencks merged pull request #385: URL: https://github.com/apache/camel-spring-boot/pull/385 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] djencks merged pull request #6264: Camel 3.11.x spring boot jsonpath (please let me squash and merge)
djencks merged pull request #6264: URL: https://github.com/apache/camel/pull/6264 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] djencks merged pull request #6263: Camel 3.12.x spring boot jsonpath (please let me squash and merge)
djencks merged pull request #6263: URL: https://github.com/apache/camel/pull/6263 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] djencks merged pull request #6262: Camel 3.7.x spring boot jsonpath (please let me squash and merge)
djencks merged pull request #6262: URL: https://github.com/apache/camel/pull/6262 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] djencks merged pull request #6261: Main spring boot jsonpath (allow me to squash and merge)
djencks merged pull request #6261: URL: https://github.com/apache/camel/pull/6261 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kafka-connector] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/main by this push: new eff4d05 Updated CHANGELOG.md eff4d05 is described below commit eff4d05c3441133e41bc4c7e753672cdbc095e95 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Oct 14 03:04:28 2021 + Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c262e23..9096d4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ **Closed issues:** +- Salesforce Camel Kafka Source Connector not converting to JSON [\#1271](https://github.com/apache/camel-kafka-connector/issues/1271) +- java.lang.NullPointerException in kinesis sink connector if headers not present [\#1268](https://github.com/apache/camel-kafka-connector/issues/1268) - AWS SQS Source Message Delete [\#1266](https://github.com/apache/camel-kafka-connector/issues/1266) - Modular packaging of connectors? [\#1264](https://github.com/apache/camel-kafka-connector/issues/1264) - Bearer Token with HTTP sink? [\#1255](https://github.com/apache/camel-kafka-connector/issues/1255)
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-942885689 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 1340037741-539-d16bbd7e-dec0-4c32-b1e6-f3d4ee3e6438 * Camel Quarkus Commit: 50e16548f154f87a25281625701e32cc21c63151 * Quarkus Main Commit: Unknown * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1340037741 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] github-actions[bot] commented on pull request #644: WIP do not merge Camel spring boot jsonpath
github-actions[bot] commented on pull request #644: URL: https://github.com/apache/camel-website/pull/644#issuecomment-942884251 Preview is available at https://pr-644--camel.netlify.app -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] neoxu999 commented on issue #1981: Mocking endpoints in camel-quarkus tests
neoxu999 commented on issue #1981: URL: https://github.com/apache/camel-quarkus/issues/1981#issuecomment-942838086 Hi @aldettinger, I checked the new extension guide. _"Let others know that you work on the given extension by either creating a new issue or asking to assign an existing one to you."_ https://camel.apache.org/camel-quarkus/latest/contributor-guide/create-new-extension.html May I get your permission to assign this task to me? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch automatic-periodic-sync updated (d8e86c0 -> 6bb18cc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. discard d8e86c0 [create-pull-request] automated change add 6bb18cc [create-pull-request] automated change This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d8e86c0) \ N -- N -- N refs/heads/automatic-periodic-sync (6bb18cc) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: core/camel-spring-boot/src/main/docs/spring-boot.adoc | 3 ++- docs/spring-boot/modules/ROOT/pages/spring-boot.adoc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
[GitHub] [camel-karavan] mgubaidullin merged pull request #21: Dark theme readme
mgubaidullin merged pull request #21: URL: https://github.com/apache/camel-karavan/pull/21 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karavan] branch main updated: Dark theme readme (#21)
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git The following commit(s) were added to refs/heads/main by this push: new 537a15a Dark theme readme (#21) 537a15a is described below commit 537a15a6f2ebcaf9bb979b15f7995d16f0c6f28d Author: Marat Gubaidullin AuthorDate: Wed Oct 13 18:10:37 2021 -0400 Dark theme readme (#21) * Dark Theme for VS Code extension README * Dark Theme for VS Code extension README --- README.md | 6 +- karavan.png | Bin 76684 -> 464789 bytes 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c526670..1cbeeab 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,11 @@ # Karavan Integration Designer for Apache Camel - +### VS Code extension + + +### Standalone application + ## Project structure 1. Karavan-generator diff --git a/karavan.png b/karavan.png index 1809130..60966ae 100644 Binary files a/karavan.png and b/karavan.png differ
[GitHub] [camel-quarkus] neoxu999 edited a comment on issue #1981: Mocking endpoints in camel-quarkus tests
neoxu999 edited a comment on issue #1981: URL: https://github.com/apache/camel-quarkus/issues/1981#issuecomment-942753749 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] neoxu999 edited a comment on issue #1981: Mocking endpoints in camel-quarkus tests
neoxu999 edited a comment on issue #1981: URL: https://github.com/apache/camel-quarkus/issues/1981#issuecomment-942753749 Hi @aldettinger , thanks for your very detailed guides, including short and long plan. I will try to add @CamelQuarkusTest and make the JVM works first. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin merged pull request #20: Dark Theme for VS Code extension
mgubaidullin merged pull request #20: URL: https://github.com/apache/camel-karavan/pull/20 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karavan] branch main updated: Dark Theme for VS Code extension (#20)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 685b55c Dark Theme for VS Code extension (#20)
685b55c is described below
commit 685b55c1319c6fa5cc3c532ccd344ebb0c8b90be
Author: Marat Gubaidullin
AuthorDate: Wed Oct 13 18:03:20 2021 -0400
Dark Theme for VS Code extension (#20)
---
.../main/webapp/src/integrations/DesignerPage.tsx | 9 +-
karavan-designer/src/App.tsx | 5 +-
karavan-designer/src/designer/karavan.css | 22 ++--
karavan-designer/src/designer/ui/DslElement.tsx| 26 +++--
karavan-designer/src/designer/ui/DslProperties.tsx | 6 +-
karavan-designer/src/designer/ui/DslSelector.tsx | 5 +-
.../src/designer/ui/KaravanDesigner.tsx| 6 +
karavan-designer/src/index.css | 32 +++---
karavan-vscode.png | Bin 0 -> 471981 bytes
karavan-vscode/src/extension.ts| 2 +-
karavan-vscode/webview/App.tsx | 10 +-
karavan-vscode/webview/index.css | 126 -
12 files changed, 182 insertions(+), 67 deletions(-)
diff --git a/karavan-app/src/main/webapp/src/integrations/DesignerPage.tsx
b/karavan-app/src/main/webapp/src/integrations/DesignerPage.tsx
index dc20b1a..089f10a 100644
--- a/karavan-app/src/main/webapp/src/integrations/DesignerPage.tsx
+++ b/karavan-app/src/main/webapp/src/integrations/DesignerPage.tsx
@@ -128,7 +128,14 @@ export class DesignerPage extends React.Component {
}
{this.state.view === 'design' &&
-
this.save(name, yaml)}/>
+ this.save(name, yaml)}
+borderColor="#fb8824"
+borderColorSelected="black"
+/>
}
diff --git a/karavan-designer/src/App.tsx b/karavan-designer/src/App.tsx
index 14e5743..e784161 100644
--- a/karavan-designer/src/App.tsx
+++ b/karavan-designer/src/App.tsx
@@ -75,7 +75,10 @@ class App extends React.Component {
return (
this.save(name,
yaml)}/>
+ onSave={(name, yaml) => this.save(name, yaml)}
+ borderColor="#fb8824"
+ borderColorSelected="black"
+/>
);
}
diff --git a/karavan-designer/src/designer/karavan.css
b/karavan-designer/src/designer/karavan.css
index c5eb8bd..135bc35 100644
--- a/karavan-designer/src/designer/karavan.css
+++ b/karavan-designer/src/designer/karavan.css
@@ -181,6 +181,7 @@
display: flex;
flex-direction: row;
height: 100%;
+background: #fafafa;
}
/*Properties*/
@@ -336,7 +337,7 @@
}
.karavan .dsl-page .flows .connections .incoming {
-border-color: #e97826;
+border-color: #fb8824;
border-style: solid;
border-radius: 50px;
border-width: 1px;
@@ -349,7 +350,7 @@
}
.karavan .dsl-page .flows .connections .outgoing {
-border-color: #e97826;
+border-color: #fb8824;
border-style: solid;
border-radius: 50px;
border-width: 1px;
@@ -376,7 +377,7 @@
}
.karavan .dsl-page .flows .connections .path {
- stroke: #e97826;
+ stroke: #fb8824;
stroke-width: 1;
fill: none;
}
@@ -397,7 +398,7 @@
width: fit-content;
margin-left: auto;
margin-right: auto;
-border-color: #e97826;
+border-color: #fb8824;
border-radius: 3px;
border-width: 1px;
min-width: 160px;
@@ -412,7 +413,7 @@
display: block;
justify-content: center;
position: relative;
-border-color: #e97826;
+border-color: #fb8824;
border-style: solid;
border-radius: 3px;
border-width: 1px;
@@ -430,7 +431,7 @@
}
.karavan .dsl-page .flows .step-element-with-steps .header {
-border-color: #e97826;
+border-color: #fb8824;
border-style: solid;
border-radius: 3px;
border-width: 1px;
@@ -488,13 +489,14 @@
border: 0;
padding: 0;
background: transparent;
-color: #e97826;
+color: #fb8824;
}
.step-element .arrow-down {
+margin-top: -1px;
font-size: 13px;
height: 16px;
-color: #e97826;
+color: #fb8824;
}
.step-element .add-button {
@@ -505,7 +507,7 @@
padding: 0;
margin: 3px 0 0 0;
background: transparent;
-color: #e97826;
+color: #fb8824;
visibility: hidden;
z-index: 100;
position: relative;
@@ -520,7 +522,7 @@
padding: 0;
margin: 3px auto 0 auto;
background: transparent;
-color: #e97826;
+color: #fca338;
visibility: hidden;
height: 100%;
display: flex;
diff --git
[GitHub] [camel-quarkus] neoxu999 commented on issue #1981: Mocking endpoints in camel-quarkus tests
neoxu999 commented on issue #1981: URL: https://github.com/apache/camel-quarkus/issues/1981#issuecomment-942753749 Hi @aldettinger , thanks for your very detailed guides. I will try to add @CamelQuarkusTest first and make the JVM works first. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] haifzhan opened a new issue #2693: Expose port using traits and make it accessible outside of the pod
haifzhan opened a new issue #2693:
URL: https://github.com/apache/camel-k/issues/2693
I have an syslog integration Java file which is listening on port `8843`.
The integration kit works properly and it can receive syslog events in the
container of the pod. I am trying to expose the port and makes it accessible
outside of the pod, what is the right way to expose it?
I have tried added traits but don't have any luck, I have asked the question
on StackOverflow:
[https://stackoverflow.com/questions/69501857/how-to-expose-a-camel-k-integration-pod-port](url),
can some shed some light on this?
```
// Split commands into multiple lines for easy read
kamel run
--trait container.enabled=true
--trait container.expose=true
--trait container.port=4739
--trait service.node-port=true
SyslogBasic.java --dev
```
```
@Override
public void configure() throws Exception {
DataFormat syslogDataFormat = new SyslogDataFormat();
String HOST = "0.0.0.0";
int PORT = 8443;
from("netty:udp://" + HOST + ":" + PORT +
"?sync=false").unmarshal(syslogDataFormat).process(new Processor() {
public void process(Exchange exchange) {
// implemented business logic
}
}).to("log:info");
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-performance-tests] vkasala opened a new issue #37: Document performance testing
vkasala opened a new issue #37: URL: https://github.com/apache/camel-performance-tests/issues/37 Document: * directory structure/mvn modules and it's prupose * how to run, evaluate test results, etc * guidelines for contributing -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton commented on a change in pull request #3180: Upgrade Quarkus to 2.4.0.CR1
jamesnetherton commented on a change in pull request #3180:
URL: https://github.com/apache/camel-quarkus/pull/3180#discussion_r728208278
##
File path:
extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
##
@@ -27,4 +29,11 @@
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
+
+@BuildStep
Review comment:
After the PR is merged, I'll create a follow up issue for removing the
runtime init classes so that we don't forget.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-quarkus] zbendhiba commented on a change in pull request #3180: Upgrade Quarkus to 2.4.0.CR1
zbendhiba commented on a change in pull request #3180:
URL: https://github.com/apache/camel-quarkus/pull/3180#discussion_r728200940
##
File path:
extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
##
@@ -27,4 +29,11 @@
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
+
+@BuildStep
Review comment:
we should check if this one is still needed, when we upgrade Optaplanner
later
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton merged pull request #3180: Upgrade Quarkus to 2.4.0.CR1
jamesnetherton merged pull request #3180: URL: https://github.com/apache/camel-quarkus/pull/3180 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] hakidehari closed issue #1271: Salesforce Camel Kafka Source Connector not converting to JSON
hakidehari closed issue #1271: URL: https://github.com/apache/camel-kafka-connector/issues/1271 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus merged pull request #6269: [CAMEL-17076] Fix typo in polling consumer docs
davsclaus merged pull request #6269: URL: https://github.com/apache/camel/pull/6269 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] oscerd closed pull request #6254: Generated sources regen
oscerd closed pull request #6254: URL: https://github.com/apache/camel/pull/6254 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus merged pull request #6268: [camel-nats] Fix headers mapping when doing a round trip to nats
davsclaus merged pull request #6268: URL: https://github.com/apache/camel/pull/6268 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] henka-rl commented on pull request #6267: CAMEL-17075 Moved initialisation from evaluate() to init()
henka-rl commented on pull request #6267: URL: https://github.com/apache/camel/pull/6267#issuecomment-942311351 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] duanasq closed issue #1268: java.lang.NullPointerException in kinesis sink connector if headers not present
duanasq closed issue #1268: URL: https://github.com/apache/camel-kafka-connector/issues/1268 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] duanasq commented on issue #1268: java.lang.NullPointerException in kinesis sink connector if headers not present
duanasq commented on issue #1268: URL: https://github.com/apache/camel-kafka-connector/issues/1268#issuecomment-942184895 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] zbendhiba merged pull request #3178: Update declaring Bean Capability
zbendhiba merged pull request #3178: URL: https://github.com/apache/camel-quarkus/pull/3178 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] hakidehari commented on issue #1271: Salesforce Camel Kafka Source Connector not converting to JSON
hakidehari commented on issue #1271: URL: https://github.com/apache/camel-kafka-connector/issues/1271#issuecomment-941258031 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #6265: CAMEL-17073: Invalid simple expression cache behavior
davsclaus commented on pull request #6265: URL: https://github.com/apache/camel/pull/6265#issuecomment-942281141 Have manually merged this, so closing this PR -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] closed pull request #6257: Generated sources regen
github-actions[bot] closed pull request #6257: URL: https://github.com/apache/camel/pull/6257 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus merged pull request #6251: Generated sources regen
davsclaus merged pull request #6251: URL: https://github.com/apache/camel/pull/6251 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] aldettinger commented on issue #1981: Mocking endpoints in camel-quarkus tests
aldettinger commented on issue #1981: URL: https://github.com/apache/camel-quarkus/issues/1981#issuecomment-942007484 Hi @neoxu999, I think we are all very busy with other subjects those days but if you are able to invest time for a long effort to explore this path on your own, then here are few directions I could point. Some users reported that they were able to @Inject a camel route in a @QuarkusTest. This apporach can't be the solution in my opinion and it had some limitations, for instance logging. But it could be a way to start playing with this subject. Camel Quarkus is about mixing the best of Camel and Quarkus, so for tests I would naively say we would need a @CamelQuarkusTest junit 5 annotation that would somehow assemble the functionalities from @QuarkusTest and CamelTestSupport. Maybe, the first step would be to read/train with JUnit5 annotations, quarkus/cdi lifecycle, see how @QuarkusTest and CamelTestSupport have been implemented. And on the long run, thinking about an approach that would allow @CamelQuarkusTest to be executed in native mode also would be killer feature. We would maybe need a way to serialize every test related objects from test process to the quarkus application under test process... -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] oscerd commented on issue #1271: Salesforce Camel Kafka Source Connector not converting to JSON
oscerd commented on issue #1271: URL: https://github.com/apache/camel-kafka-connector/issues/1271#issuecomment-941295524 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] oscerd closed pull request #6259: Generated sources regen
oscerd closed pull request #6259: URL: https://github.com/apache/camel/pull/6259 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] vsokolov00 removed a comment on pull request #2680: [TEST] Missing cli tests were added
vsokolov00 removed a comment on pull request #2680: URL: https://github.com/apache/camel-k/pull/2680#issuecomment-940922972 is it planned to include these tests to the 1.6? 樂 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] aloubyansky commented on issue #3173: [Quarkus 2.4.0] Messaging tests fail with ambiguous dependencies for `org.apache.camel.quarkus.component.messaging.it.util.scheme.Compone
aloubyansky commented on issue #3173: URL: https://github.com/apache/camel-quarkus/issues/3173#issuecomment-941163852 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] zregvart edited a comment on issue #1271: Salesforce Camel Kafka Source Connector not converting to JSON
zregvart edited a comment on issue #1271: URL: https://github.com/apache/camel-kafka-connector/issues/1271#issuecomment-941291794 > @zregvart Is there any workaround that you could think of for this? Apart from marshalling to JSON in a data transformation step, I can't think of any. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] henka-rl edited a comment on pull request #6267: CAMEL-17075 Moved initialisation from evaluate() to init()
henka-rl edited a comment on pull request #6267:
URL: https://github.com/apache/camel/pull/6267#issuecomment-942387730
I tried to solve the issue with parsing exception in init like this:
`@Override
public T evaluate(Exchange exchange, Class type) {
if (expressionException == null) {
return expression.evaluate(exchange, type);
} else {
throw expressionException;
}
}
@Override
public boolean matches(Exchange exchange) {
if (predicateException == null) {
return predicate.matches(exchange);
} else {
throw predicateException;
}
}
@Override
public void init(CamelContext context) {
simple = context.resolveLanguage("simple");
text = context.resolvePropertyPlaceholders(text);
try {
if (resultType != null) {
Object[] properties = new Object[2];
properties[0] = resultType;
expression = simple.createExpression(text, properties);
} else {
expression = simple.createExpression(text);
}
expression.init(context);
} catch (RuntimeCamelException e) {
expressionException = e;
}
try {
predicate = simple.createPredicate(text);
predicate.init(context);
} catch (RuntimeCamelException e) {
predicateException = e;
}
}`
But not all testcases pass anyway as it looks like init() is not always
called before the first call to evaluate() or matches()
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-quarkus] neoxu999 commented on issue #1981: Mocking endpoints in camel-quarkus tests
neoxu999 commented on issue #1981: URL: https://github.com/apache/camel-quarkus/issues/1981#issuecomment-941738193 Hi @jamesnetherton , in most cases, we only need CamelTestSupport in JVM testing, mocking routes. For native, we can use integration test. Can you please provide some advice? How to move camel-test to camel-quarkus-test? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus closed pull request #6265: CAMEL-17073: Invalid simple expression cache behavior
davsclaus closed pull request #6265: URL: https://github.com/apache/camel/pull/6265 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] zbendhiba commented on pull request #3170: Aws sqs test fix
zbendhiba commented on pull request #3170: URL: https://github.com/apache/camel-quarkus/pull/3170#issuecomment-942009014 > I don't understand. It has been rebased with newest changes and yet the tests (not sqs tests) are failing... Let me try this locally on my machine -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
