buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/34205 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/34204 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel] 03/07: [CAMEL-13564] Move more methods to ErrorHandlerReifier
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit eccc13cf676fe823522b7590087d3eae648873d1
Author: Guillaume Nodet
AuthorDate: Mon May 27 22:40:31 2019 +0200
[CAMEL-13564] Move more methods to ErrorHandlerReifier
---
.../cdi/transaction/JtaTransactionPolicy.java | 4 +-
.../camel/spring/spi/SpringTransactionPolicy.java | 4 +-
.../camel/builder/ErrorHandlerBuilderRef.java | 101 +
.../org/apache/camel/model/RouteDefinition.java| 3 +-
.../reifier/errorhandler/ErrorHandlerReifier.java | 99
.../DefaultManagementObjectNameStrategy.java | 7 +-
6 files changed, 110 insertions(+), 108 deletions(-)
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
index d2dd5ebe..e0e6c46 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
@@ -87,9 +87,9 @@ public abstract class JtaTransactionPolicy implements
TransactedPolicy {
// only lookup if there was explicit an error handler builder
configured
// otherwise its just the "default" that has not explicit been
configured
// and if so then we can safely replace that with our transacted
error handler
-if (ErrorHandlerBuilderRef.isErrorHandlerFactoryConfigured(ref)) {
+if (ErrorHandlerReifier.isErrorHandlerFactoryConfigured(ref)) {
LOG.debug("Looking up ErrorHandlerBuilder with ref: {}", ref);
-builder = (ErrorHandlerBuilder)
ErrorHandlerBuilderRef.lookupErrorHandlerFactory(routeContext, ref);
+builder = (ErrorHandlerBuilder)
ErrorHandlerReifier.lookupErrorHandlerFactory(routeContext, ref);
}
}
diff --git
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
index a67b4f3..a35f9b2 100644
---
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
+++
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
@@ -80,9 +80,9 @@ public class SpringTransactionPolicy implements
TransactedPolicy {
// only lookup if there was explicit an error handler builder
configured
// otherwise its just the "default" that has not explicit been
configured
// and if so then we can safely replace that with our transacted
error handler
-if (ErrorHandlerBuilderRef.isErrorHandlerFactoryConfigured(ref)) {
+if (ErrorHandlerReifier.isErrorHandlerFactoryConfigured(ref)) {
LOG.debug("Looking up ErrorHandlerBuilder with ref: {}", ref);
-builder =
(ErrorHandlerBuilder)ErrorHandlerBuilderRef.lookupErrorHandlerFactory(routeContext,
ref);
+builder = (ErrorHandlerBuilder)
ErrorHandlerReifier.lookupErrorHandlerFactory(routeContext, ref);
}
}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
b/core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
index 27e4c42..2d854e3 100644
---
a/core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
+++
b/core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
@@ -20,12 +20,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.camel.CamelContext;
import org.apache.camel.ErrorHandlerFactory;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Processor;
import org.apache.camel.model.OnExceptionDefinition;
-import org.apache.camel.model.RouteDefinition;
import org.apache.camel.reifier.errorhandler.ErrorHandlerReifier;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
@@ -34,7 +31,6 @@ import org.apache.camel.util.ObjectHelper;
* Represents a proxy to an error handler builder which is resolved by named
reference
*/
public class ErrorHandlerBuilderRef extends ErrorHandlerBuilderSupport {
-public static final String DEFAULT_ERROR_HANDLER_BUILDER =
"CamelDefaultErrorHandlerBuilder";
private final String ref;
private final Map handlers = new
HashMap<>();
private boolean supportTransacted;
@@ -88,107 +84,12 @@ public class ErrorHandlerBuilderRef extends
ErrorHandlerBuilderSupport {
other.supportTransacted = supportTransacted;
}
-/**
- * Lookup the error handler by the given ref
- *
-
[camel] 04/07: [CAMEL-13564] Remove redundant error handler configuration
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c12994378526496eb7f3e61a33d588dd76abc41b
Author: Guillaume Nodet
AuthorDate: Tue May 28 11:19:49 2019 +0200
[CAMEL-13564] Remove redundant error handler configuration
---
.../cdi/transaction/JtaTransactionPolicy.java | 3 ---
.../camel/spring/spi/SpringTransactionPolicy.java | 6 --
.../apache/camel/builder/ErrorHandlerBuilder.java | 23 --
.../camel/builder/ErrorHandlerBuilderSupport.java | 15 ++
.../apache/camel/reifier/DynamicRouterReifier.java | 1 -
5 files changed, 15 insertions(+), 33 deletions(-)
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
index e0e6c46..e639526 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
@@ -116,9 +116,6 @@ public abstract class JtaTransactionPolicy implements
TransactedPolicy {
}
answer = createTransactionErrorHandler(routeContext, processor,
txBuilder);
-answer.setExceptionPolicy(txBuilder.getExceptionPolicyStrategy());
-// configure our answer based on the existing error handler
-txBuilder.configure(routeContext, answer);
// set the route to use our transacted error handler builder
route.setErrorHandlerFactory(txBuilder);
diff --git
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
index a35f9b2..982b932 100644
---
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
+++
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
@@ -90,9 +90,6 @@ public class SpringTransactionPolicy implements
TransactedPolicy {
// already a TX error handler then we are good to go
LOG.debug("The ErrorHandlerBuilder configured is already a
TransactionErrorHandlerBuilder: {}", builder);
answer = createTransactionErrorHandler(routeContext, processor,
builder);
-answer.setExceptionPolicy(builder.getExceptionPolicyStrategy());
-// configure our answer based on the existing error handler
-builder.configure(routeContext, answer);
} else {
// no transaction error handler builder configure so create a
temporary one as we got all
// the needed information form the configured builder anyway this
allow us to use transacted
@@ -110,9 +107,6 @@ public class SpringTransactionPolicy implements
TransactedPolicy {
txBuilder.setErrorHandlers(routeContext,
builder.getErrorHandlers(routeContext));
}
answer = createTransactionErrorHandler(routeContext, processor,
txBuilder);
-answer.setExceptionPolicy(txBuilder.getExceptionPolicyStrategy());
-// configure our answer based on the existing error handler
-txBuilder.configure(routeContext, answer);
// set the route to use our transacted error handler builder
route.setErrorHandlerFactory(txBuilder);
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
b/core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
index e4c87a8..e814dba 100644
---
a/core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
+++
b/core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
@@ -20,8 +20,6 @@ import java.util.List;
import org.apache.camel.ErrorHandlerFactory;
import org.apache.camel.model.OnExceptionDefinition;
-import org.apache.camel.processor.ErrorHandler;
-import org.apache.camel.processor.errorhandler.ExceptionPolicyStrategy;
import org.apache.camel.spi.RouteContext;
/**
@@ -53,32 +51,11 @@ public interface ErrorHandlerBuilder extends
ErrorHandlerFactory {
List getErrorHandlers(RouteContext routeContext);
/**
- * Gets the exception policy strategy
- */
-ExceptionPolicyStrategy getExceptionPolicyStrategy();
-
-/**
- * Sets the exception policy strategy to use for resolving the {@link
org.apache.camel.model.OnExceptionDefinition}
- * to use for a given thrown exception
- *
- * @param exceptionPolicyStrategy the exception policy strategy
- */
-void setExceptionPolicyStrategy(ExceptionPolicyStrategy
exceptionPolicyStrategy);
-
-/**
* Whether this error handler supports transacted exchanges.
*/
boolean supportTransacted();
[camel] 06/07: [CAMEL-13564] Move state from ErrorHandlerBuilder to RouteContext
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 63634ae617e84f7beb997deb61ac6035c68f7af4
Author: Guillaume Nodet
AuthorDate: Tue May 28 15:52:00 2019 +0200
[CAMEL-13564] Move state from ErrorHandlerBuilder to RouteContext
---
.../cdi/transaction/JtaTransactionPolicy.java | 2 +-
.../camel/spring/spi/SpringTransactionPolicy.java | 2 +-
.../java/org/apache/camel/spi/RouteContext.java| 24 ++
.../camel/impl/engine/DefaultRouteContext.java | 22 ++
.../apache/camel/builder/ErrorHandlerBuilder.java | 23 --
.../camel/builder/ErrorHandlerBuilderRef.java | 34 +---
.../camel/builder/ErrorHandlerBuilderSupport.java | 50 ++--
.../camel/impl/AbstractModelCamelContext.java | 5 --
.../apache/camel/reifier/OnExceptionReifier.java | 2 +-
.../reifier/errorhandler/ErrorHandlerReifier.java | 11 ++-
.../camel/builder/ErrorHandlerBuilderRefTest.java | 90 --
11 files changed, 63 insertions(+), 202 deletions(-)
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
index e639526..eaa00c6 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
@@ -112,7 +112,7 @@ public abstract class JtaTransactionPolicy implements
TransactedPolicy {
// use error handlers from the configured builder
if (builder != null) {
-txBuilder.setErrorHandlers(routeContext,
builder.getErrorHandlers(routeContext));
+routeContext.addErrorHandlerFactoryReference(builder, txBuilder);
}
answer = createTransactionErrorHandler(routeContext, processor,
txBuilder);
diff --git
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
index 982b932..c9d3003 100644
---
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
+++
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
@@ -104,7 +104,7 @@ public class SpringTransactionPolicy implements
TransactedPolicy {
txBuilder.setSpringTransactionPolicy(this);
if (builder != null) {
// use error handlers from the configured builder
-txBuilder.setErrorHandlers(routeContext,
builder.getErrorHandlers(routeContext));
+routeContext.addErrorHandlerFactoryReference(builder,
txBuilder);
}
answer = createTransactionErrorHandler(routeContext, processor,
txBuilder);
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/RouteContext.java
b/core/camel-api/src/main/java/org/apache/camel/spi/RouteContext.java
index d67feef..48c8967 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/RouteContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/RouteContext.java
@@ -18,6 +18,7 @@ package org.apache.camel.spi;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
@@ -253,4 +254,27 @@ public interface RouteContext extends
RuntimeConfiguration, EndpointAware {
void setOnException(String onExceptionId, Processor processor);
+/**
+ * Adds error handler for the given exception type
+ *
+ * @param factory the error handler factory
+ * @param exception the exception to handle
+ */
+void addErrorHandler(ErrorHandlerFactory factory, NamedNode exception);
+
+/**
+ * Gets the error handlers
+ *
+ * @param factory the error handler factory
+ */
+Set getErrorHandlers(ErrorHandlerFactory factory);
+
+/**
+ * Link the error handlers from a factory to another
+ *
+ * @param sourcethe source factory
+ * @param targetthe target factory
+ */
+void addErrorHandlerFactoryReference(ErrorHandlerFactory source,
ErrorHandlerFactory target);
+
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteContext.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteContext.java
index 5c362ab..14628e3 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteContext.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteContext.java
@@ -18,8 +18,10 @@ package org.apache.camel.impl.engine;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.LinkedHashSet;
import java.util.List;
[camel] 02/07: [CAMEL-13564] Move error handler processors to camel-base
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 0b0663e95d6419ffce34aeebb005c174bc0c1466 Author: Guillaume Nodet AuthorDate: Fri May 24 18:05:43 2019 +0200 [CAMEL-13564] Move error handler processors to camel-base --- .../transaction/JtaTransactionErrorHandler.java| 2 +- .../cdi/transaction/TransactionErrorHandler.java | 2 +- .../camel/spring/spi/TransactionErrorHandler.java | 2 +- .../processor/errorhandler/DeadLetterChannel.java | 1 - .../errorhandler/DefaultErrorHandler.java | 1 - .../DefaultExceptionPolicyStrategy.java| 80 +++ .../errorhandler/ErrorHandlerSupport.java | 9 +- .../processor/errorhandler/ExceptionPolicy.java| 261 + .../errorhandler}/ExceptionPolicyKey.java | 4 +- .../errorhandler}/ExceptionPolicyStrategy.java | 13 +- .../errorhandler/RedeliveryErrorHandler.java | 1 - .../processor/errorhandler/RedeliveryPolicy.java | 0 .../camel/processor/errorhandler}/package.html | 0 .../apache/camel/builder/ErrorHandlerBuilder.java | 2 +- .../camel/builder/ErrorHandlerBuilderSupport.java | 15 +- .../processor/exceptionpolicy/ExceptionPolicy.java | 85 --- .../apache/camel/reifier/DynamicRouterReifier.java | 2 +- .../apache/camel/reifier/OnExceptionReifier.java | 1 - .../errorhandler/DefaultErrorHandlerReifier.java | 6 - .../reifier/errorhandler/ErrorHandlerReifier.java | 109 + .../CustomExceptionPolicyStrategyTest.java | 12 +- .../DefaultExceptionPolicyStrategyTest.java| 63 +++-- 22 files changed, 427 insertions(+), 244 deletions(-) diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandler.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandler.java index 915b7b0..19e9f9a 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandler.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandler.java @@ -24,7 +24,7 @@ import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.processor.errorhandler.RedeliveryErrorHandler; import org.apache.camel.processor.errorhandler.RedeliveryPolicy; -import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy; +import org.apache.camel.processor.errorhandler.ExceptionPolicyStrategy; import org.apache.camel.spi.CamelLogger; /** diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java index c8f43ae..deb42af 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java @@ -32,7 +32,7 @@ import org.apache.camel.Navigate; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; import org.apache.camel.processor.errorhandler.ErrorHandlerSupport; -import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy; +import org.apache.camel.processor.errorhandler.ExceptionPolicyStrategy; import org.apache.camel.spi.ShutdownPrepared; import org.apache.camel.support.AsyncCallbackToCompletableFutureAdapter; import org.apache.camel.support.ExchangeHelper; diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java index c6be3d7..7a06af2 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java @@ -27,7 +27,7 @@ import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; import org.apache.camel.processor.errorhandler.RedeliveryErrorHandler; import org.apache.camel.processor.errorhandler.RedeliveryPolicy; -import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy; +import org.apache.camel.processor.errorhandler.ExceptionPolicyStrategy; import org.apache.camel.spi.CamelLogger; import org.apache.camel.support.AsyncProcessorSupport; import org.apache.camel.support.ExchangeHelper; diff --git a/core/camel-core/src/main/java/org/apache/camel/processor/errorhandler/DeadLetterChannel.java b/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/DeadLetterChannel.java similarity index 98% rename from core/camel-core/src/main/java/org/apache/camel/processor/errorhandler/DeadLetterChannel.java rename to
[camel] 07/07: [CAMEL-13564] Move DefaultChannel to camel-base
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bfe9336ce5a9c2c7ba3728cda74136ddc8432aa7
Author: Guillaume Nodet
AuthorDate: Tue May 28 23:17:24 2019 +0200
[CAMEL-13564] Move DefaultChannel to camel-base
---
.../src/main/java/org/apache/camel/Channel.java| 45 ++-
.../camel/processor/channel/DefaultChannel.java| 136 -
.../java/org/apache/camel/model/ModelChannel.java | 56 -
.../org/apache/camel/reifier/ProcessorReifier.java | 69 +++
.../RandomLoadBalanceJavaDSLBuilderTest.java | 2 +-
5 files changed, 105 insertions(+), 203 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/Channel.java
b/core/camel-api/src/main/java/org/apache/camel/Channel.java
index 5ffe260..0a73529 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Channel.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Channel.java
@@ -29,20 +29,6 @@ import org.apache.camel.spi.RouteContext;
public interface Channel extends AsyncProcessor, Navigate {
/**
- * Sets the processor that the channel should route the {@link Exchange}
to.
- *
- * @param next the next processor
- */
-void setNextProcessor(Processor next);
-
-/**
- * Sets the {@link org.apache.camel.processor.ErrorHandler} this Channel
uses.
- *
- * @param errorHandler the error handler
- */
-void setErrorHandler(Processor errorHandler);
-
-/**
* Gets the {@link org.apache.camel.processor.ErrorHandler} this Channel
uses.
*
* @return the error handler, or null if no error handler is used.
@@ -50,29 +36,6 @@ public interface Channel extends AsyncProcessor,
Navigate {
Processor getErrorHandler();
/**
- * Adds a {@link org.apache.camel.spi.InterceptStrategy} to apply each
{@link Exchange} before
- * its routed to the next {@link Processor}.
- *
- * @param strategy the intercept strategy
- */
-void addInterceptStrategy(InterceptStrategy strategy);
-
-/**
- * Adds a list of {@link org.apache.camel.spi.InterceptStrategy} to apply
each {@link Exchange} before
- * its routed to the next {@link Processor}.
- *
- * @param strategy list of strategies
- */
-void addInterceptStrategies(List strategy);
-
-/**
- * Gets the list of {@link org.apache.camel.spi.InterceptStrategy}
registered to this Channel.
- *
- * @return list of strategies, returns an empty list if no strategies is
registered.
- */
-List getInterceptStrategies();
-
-/**
* Gets the wrapped output that at runtime should be delegated to.
*
* @return the output to route the {@link Exchange} to
@@ -99,4 +62,12 @@ public interface Channel extends AsyncProcessor,
Navigate {
* @return the route context
*/
RouteContext getRouteContext();
+
+/**
+ * Gets the definition of the next processor
+ *
+ * @return the processor definition
+ */
+NamedNode getProcessorDefinition();
+
}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java
b/core/camel-base/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java
similarity index 73%
rename from
core/camel-core/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java
rename to
core/camel-base/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java
index bf77f86..d519a9b 100644
---
a/core/camel-core/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java
+++
b/core/camel-base/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java
@@ -26,20 +26,13 @@ import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Channel;
import org.apache.camel.Exchange;
+import org.apache.camel.NamedNode;
import org.apache.camel.Processor;
-import org.apache.camel.model.ModelChannel;
-import org.apache.camel.model.OnCompletionDefinition;
-import org.apache.camel.model.OnExceptionDefinition;
-import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.model.ProcessorDefinitionHelper;
-import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.model.RouteDefinitionHelper;
import org.apache.camel.processor.CamelInternalProcessor;
import org.apache.camel.processor.WrapProcessor;
import org.apache.camel.processor.errorhandler.RedeliveryErrorHandler;
import org.apache.camel.processor.interceptor.BacklogDebugger;
import org.apache.camel.processor.interceptor.BacklogTracer;
-import org.apache.camel.spi.CamelInternalProcessorAdvice;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.ManagementInterceptStrategy;
import org.apache.camel.spi.MessageHistoryFactory;
@@ -57,23 +50,18 @@ import org.apache.camel.support.service.ServiceHelper;
* {@link Exchange}
[camel] 05/07: Use custom ports for management tests
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8f5f59f5dcb8ffa1547afb20cd63bfadaeba365b
Author: Guillaume Nodet
AuthorDate: Tue May 28 11:36:30 2019 +0200
Use custom ports for management tests
---
.../camel/management/ManagedComponentTest.java | 3 +-
.../camel/management/ManagementTestSupport.java| 19 +++
.../camel/management/util/AvailablePortFinder.java | 167 +
3 files changed, 187 insertions(+), 2 deletions(-)
diff --git
a/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedComponentTest.java
b/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedComponentTest.java
index acbea64..b78f6c4 100644
---
a/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedComponentTest.java
+++
b/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedComponentTest.java
@@ -80,8 +80,7 @@ public class ManagedComponentTest extends
ManagementTestSupport {
return;
}
-JMXConnector connector = JMXConnectorFactory.connect(new
JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi/camel"));
-MBeanServerConnection mbeanServer =
connector.getMBeanServerConnection();
+MBeanServerConnection mbeanServer = getMBeanServer();
ObjectName on =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=components,name=\"my-verifiable-component\"");
assertTrue(mbeanServer.isRegistered(on));
diff --git
a/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagementTestSupport.java
b/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagementTestSupport.java
index 2965622..a4057bd 100644
---
a/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagementTestSupport.java
+++
b/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagementTestSupport.java
@@ -17,6 +17,7 @@
package org.apache.camel.management;
import java.io.IOException;
+import java.util.Random;
import javax.management.InstanceNotFoundException;
import javax.management.MBeanException;
@@ -26,17 +27,35 @@ import javax.management.ObjectName;
import javax.management.ReflectionException;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.api.management.JmxSystemPropertyKeys;
+import org.apache.camel.management.util.AvailablePortFinder;
+import org.junit.Before;
/**
* Base class for JMX tests.
*/
public abstract class ManagementTestSupport extends ContextTestSupport {
+protected int registryPort;
+protected String url;
+
@Override
protected boolean useJmx() {
return true;
}
+@Override
+@Before
+public void setUp() throws Exception {
+registryPort = AvailablePortFinder.getNextAvailable();
+log.info("Using port " + registryPort);
+
+// need to explicit set it to false to use non-platform mbs
+System.setProperty(JmxSystemPropertyKeys.CREATE_CONNECTOR, "true");
+System.setProperty(JmxSystemPropertyKeys.REGISTRY_PORT, "" +
registryPort);
+super.setUp();
+}
+
protected MBeanServer getMBeanServer() {
return
context.getManagementStrategy().getManagementAgent().getMBeanServer();
}
diff --git
a/core/camel-management-impl/src/test/java/org/apache/camel/management/util/AvailablePortFinder.java
b/core/camel-management-impl/src/test/java/org/apache/camel/management/util/AvailablePortFinder.java
new file mode 100644
index 000..04a14b2
--- /dev/null
+++
b/core/camel-management-impl/src/test/java/org/apache/camel/management/util/AvailablePortFinder.java
@@ -0,0 +1,167 @@
+/*
+ * 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.management.util;
+
+import java.io.IOException;
+import java.net.DatagramSocket;
+import java.net.ServerSocket;
+import java.util.NoSuchElementException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Finds currently available server ports.
+
[camel] 01/07: [CAMEL-13564] Split exception/error handling model from runtime
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 552ee0cc3eb736de8b360eb910d8571df6b558b0
Author: Guillaume Nodet
AuthorDate: Thu May 23 17:46:33 2019 +0200
[CAMEL-13564] Split exception/error handling model from runtime
Remaining things:
- MulticastProcessor.createErrorHandler
- ErrorHandlerRefReifier.createErrorHandler
- move state from ErrorHandlerBuilderSupport and ErrorHandlerBuilderRef
to RouteContext
---
components/camel-blueprint/pom.xml | 4 +
.../blueprint/CamelErrorHandlerFactoryBean.java| 2 +-
.../cdi/transaction/JtaTransactionPolicy.java | 3 +-
.../camel/spring/spi/SpringTransactionPolicy.java | 3 +-
.../spring/spi/TransactionErrorHandlerBuilder.java | 5 +
.../spring/spi/TransactionErrorHandlerReifier.java | 89
.../camel/builder/DefaultErrorHandlerBuilder.java | 8 ++
.../camel/builder/ErrorHandlerBuilderRef.java | 3 +-
.../camel/builder/ErrorHandlerBuilderSupport.java | 62 ++-
.../errorhandler/ErrorHandlerSupport.java | 59 ++-
.../errorhandler/RedeliveryErrorHandler.java | 30 ++
.../DefaultExceptionPolicyStrategy.java| 59 +--
.../processor/exceptionpolicy/ExceptionPolicy.java | 85 +++
.../exceptionpolicy/ExceptionPolicyKey.java| 8 +-
.../exceptionpolicy/ExceptionPolicyStrategy.java | 9 +-
.../apache/camel/reifier/DynamicRouterReifier.java | 3 +-
.../apache/camel/reifier/OnExceptionReifier.java | 1 +
.../org/apache/camel/reifier/ProcessorReifier.java | 3 +-
.../apache/camel/reifier/RoutingSlipReifier.java | 3 +-
.../errorhandler/DeadLetterChannelReifier.java | 48 +
.../errorhandler/DefaultErrorHandlerReifier.java | 69
.../errorhandler/ErrorHandlerRefReifier.java | 19
.../{ => errorhandler}/ErrorHandlerReifier.java| 118 +++--
.../errorhandler/NoErrorHandlerReifier.java| 41 +++
.../ValidatorEndpointClearCachedSchemaTest.java| 5 +
.../errorhandler/ErrorHandlerSupportTest.java | 13 +--
.../CustomExceptionPolicyStrategyTest.java | 3 +-
.../DefaultExceptionPolicyStrategyTest.java| 48 -
28 files changed, 641 insertions(+), 162 deletions(-)
diff --git a/components/camel-blueprint/pom.xml
b/components/camel-blueprint/pom.xml
index a7880bf..3179463 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -52,6 +52,10 @@
camel-core-osgi
+org.apache.camel
+camel-core
+
+
org.osgi
osgi.core
provided
diff --git
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
index de4aa2f..38199df 100644
---
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
+++
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
@@ -31,7 +31,7 @@ import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.core.xml.AbstractCamelFactoryBean;
import org.apache.camel.model.RedeliveryPolicyDefinition;
import org.apache.camel.processor.errorhandler.RedeliveryPolicy;
-import org.apache.camel.reifier.ErrorHandlerReifier;
+import org.apache.camel.reifier.errorhandler.ErrorHandlerReifier;
import org.osgi.service.blueprint.container.BlueprintContainer;
@XmlRootElement(name = "errorHandler")
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
index e674b3d..d2dd5ebe 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
@@ -26,6 +26,7 @@ import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.builder.ErrorHandlerBuilderRef;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.reifier.errorhandler.ErrorHandlerReifier;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.spi.TransactedPolicy;
import org.slf4j.Logger;
@@ -130,7 +131,7 @@ public abstract class JtaTransactionPolicy implements
TransactedPolicy {
ErrorHandlerBuilder builder) {
JtaTransactionErrorHandler answer;
try {
-answer = (JtaTransactionErrorHandler)
builder.createErrorHandler(routeContext, processor);
+answer =
[camel] branch master updated (36cdd36 -> bfe9336)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 36cdd36 [CAMEL-13593]avoid “expected resource not found” warnings
when using camel-mail in OSGi
new 552ee0c [CAMEL-13564] Split exception/error handling model from
runtime
new 0b0663e [CAMEL-13564] Move error handler processors to camel-base
new eccc13c [CAMEL-13564] Move more methods to ErrorHandlerReifier
new c129943 [CAMEL-13564] Remove redundant error handler configuration
new 8f5f59f Use custom ports for management tests
new 63634ae [CAMEL-13564] Move state from ErrorHandlerBuilder to
RouteContext
new bfe9336 [CAMEL-13564] Move DefaultChannel to camel-base
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:
components/camel-blueprint/pom.xml | 4 +
.../blueprint/CamelErrorHandlerFactoryBean.java| 2 +-
.../transaction/JtaTransactionErrorHandler.java| 2 +-
.../cdi/transaction/JtaTransactionPolicy.java | 12 +-
.../cdi/transaction/TransactionErrorHandler.java | 2 +-
.../camel/spring/spi/SpringTransactionPolicy.java | 15 +-
.../camel/spring/spi/TransactionErrorHandler.java | 2 +-
.../spring/spi/TransactionErrorHandlerBuilder.java | 5 +
.../spring/spi/TransactionErrorHandlerReifier.java | 89 +
.../src/main/java/org/apache/camel/Channel.java| 45 +--
.../java/org/apache/camel/spi/RouteContext.java| 24 ++
.../camel/impl/engine/DefaultRouteContext.java | 22 ++
.../camel/processor/channel/DefaultChannel.java| 136 +++-
.../processor/errorhandler/DeadLetterChannel.java | 1 -
.../errorhandler/DefaultErrorHandler.java | 1 -
.../DefaultExceptionPolicyStrategy.java| 89 +++--
.../errorhandler/ErrorHandlerSupport.java | 93 ++
.../processor/errorhandler/ExceptionPolicy.java| 261 +++
.../errorhandler}/ExceptionPolicyKey.java | 12 +-
.../errorhandler}/ExceptionPolicyStrategy.java | 14 +-
.../errorhandler/RedeliveryErrorHandler.java | 29 +-
.../processor/errorhandler/RedeliveryPolicy.java | 0
.../camel/processor/errorhandler}/package.html | 0
.../camel/builder/DefaultErrorHandlerBuilder.java | 8 +
.../apache/camel/builder/ErrorHandlerBuilder.java | 46 ---
.../camel/builder/ErrorHandlerBuilderRef.java | 138 +---
.../camel/builder/ErrorHandlerBuilderSupport.java | 112 ---
.../camel/impl/AbstractModelCamelContext.java | 5 -
.../java/org/apache/camel/model/ModelChannel.java | 56
.../org/apache/camel/model/RouteDefinition.java| 3 +-
.../errorhandler/ErrorHandlerSupport.java | 137
.../apache/camel/reifier/DynamicRouterReifier.java | 6 +-
.../apache/camel/reifier/ErrorHandlerReifier.java | 152 -
.../apache/camel/reifier/OnExceptionReifier.java | 2 +-
.../org/apache/camel/reifier/ProcessorReifier.java | 72 ++--
.../apache/camel/reifier/RoutingSlipReifier.java | 3 +-
.../errorhandler/DeadLetterChannelReifier.java | 48 +++
.../errorhandler/DefaultErrorHandlerReifier.java | 63
.../errorhandler/ErrorHandlerRefReifier.java | 19 ++
.../reifier/errorhandler/ErrorHandlerReifier.java | 361 +
.../errorhandler/NoErrorHandlerReifier.java| 41 +++
.../camel/builder/ErrorHandlerBuilderRefTest.java | 90 -
.../ValidatorEndpointClearCachedSchemaTest.java| 5 +
.../RandomLoadBalanceJavaDSLBuilderTest.java | 2 +-
.../errorhandler/ErrorHandlerSupportTest.java | 13 +-
.../CustomExceptionPolicyStrategyTest.java | 13 +-
.../DefaultExceptionPolicyStrategyTest.java| 71 ++--
.../DefaultManagementObjectNameStrategy.java | 7 +-
.../camel/management/ManagedComponentTest.java | 3 +-
.../camel/management/ManagementTestSupport.java| 19 ++
.../camel/management/util/AvailablePortFinder.java | 167 ++
51 files changed, 1558 insertions(+), 964 deletions(-)
create mode 100644
components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerReifier.java
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java
(73%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/processor/errorhandler/DeadLetterChannel.java
(98%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/processor/errorhandler/DefaultErrorHandler.java
(97%)
rename
core/{camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy =>
camel-base/src/main/java/org/apache/camel/processor/errorhandler}/DefaultExceptionPolicyStrategy.java
(70%)
create mode
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/34197 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/34196 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel] branch camel-2.22.x updated: [CAMEL-13593]avoid “expected resource not found” warnings when using camel-mail in OSGi
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch camel-2.22.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.22.x by this push: new 59a8bee [CAMEL-13593]avoid “expected resource not found” warnings when using camel-mail in OSGi 59a8bee is described below commit 59a8bee0ee6a889ed3505ad59fbaa8a14095ea83 Author: Freeman Fang AuthorDate: Tue May 28 11:43:56 2019 -0400 [CAMEL-13593]avoid “expected resource not found” warnings when using camel-mail in OSGi (cherry picked from commit a13bb2995f3f61d7261c2b20ee2ecf484599a06c) (cherry picked from commit a2e8be7f61963d907b682e33f4704d69d56c3491) (cherry picked from commit 7a4fedca83722b37a42e9b81ae7d4bb9f947a3e8) --- components/camel-mail/pom.xml | 29 + 1 file changed, 29 insertions(+) diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml index 5a29d68..b37e1de 100644 --- a/components/camel-mail/pom.xml +++ b/components/camel-mail/pom.xml @@ -137,6 +137,35 @@ -Dfile.encoding=UTF-8 + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + + com.sun.mail:javax.mail + + + + + com.sun.mail:javax.mail + + META-INF/javamail.default.address.map + META-INF/javamail.default.providers + + + + true + + + +
[camel] branch camel-2.23.x updated: [CAMEL-13593]avoid “expected resource not found” warnings when using camel-mail in OSGi
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch camel-2.23.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.23.x by this push: new 7a4fedc [CAMEL-13593]avoid “expected resource not found” warnings when using camel-mail in OSGi 7a4fedc is described below commit 7a4fedca83722b37a42e9b81ae7d4bb9f947a3e8 Author: Freeman Fang AuthorDate: Tue May 28 11:43:56 2019 -0400 [CAMEL-13593]avoid “expected resource not found” warnings when using camel-mail in OSGi (cherry picked from commit a13bb2995f3f61d7261c2b20ee2ecf484599a06c) (cherry picked from commit a2e8be7f61963d907b682e33f4704d69d56c3491) --- components/camel-mail/pom.xml | 29 + 1 file changed, 29 insertions(+) diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml index 67217fe..4d23b91 100644 --- a/components/camel-mail/pom.xml +++ b/components/camel-mail/pom.xml @@ -137,6 +137,35 @@ -Dfile.encoding=UTF-8 + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + + com.sun.mail:javax.mail + + + + + com.sun.mail:javax.mail + + META-INF/javamail.default.address.map + META-INF/javamail.default.providers + + + + true + + + +
[camel] branch camel-2.24.x updated: [CAMEL-13593]avoid “expected resource not found” warnings when using camel-mail in OSGi
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch camel-2.24.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.24.x by this push: new a2e8be7 [CAMEL-13593]avoid “expected resource not found” warnings when using camel-mail in OSGi a2e8be7 is described below commit a2e8be7f61963d907b682e33f4704d69d56c3491 Author: Freeman Fang AuthorDate: Tue May 28 11:43:56 2019 -0400 [CAMEL-13593]avoid “expected resource not found” warnings when using camel-mail in OSGi (cherry picked from commit a13bb2995f3f61d7261c2b20ee2ecf484599a06c) --- components/camel-mail/pom.xml | 29 + 1 file changed, 29 insertions(+) diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml index b597333..e17c21f 100644 --- a/components/camel-mail/pom.xml +++ b/components/camel-mail/pom.xml @@ -137,6 +137,35 @@ -Dfile.encoding=UTF-8 + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + + com.sun.mail:javax.mail + + + + + com.sun.mail:javax.mail + + META-INF/javamail.default.address.map + META-INF/javamail.default.providers + + + + true + + + +
[camel] branch camel-2.x updated: [CAMEL-13593]avoid “expected resource not found” warnings when using camel-mail in OSGi
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.x by this push: new a13bb29 [CAMEL-13593]avoid “expected resource not found” warnings when using camel-mail in OSGi a13bb29 is described below commit a13bb2995f3f61d7261c2b20ee2ecf484599a06c Author: Freeman Fang AuthorDate: Tue May 28 11:43:56 2019 -0400 [CAMEL-13593]avoid “expected resource not found” warnings when using camel-mail in OSGi --- components/camel-mail/pom.xml | 29 + 1 file changed, 29 insertions(+) diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml index bef1f01..75a3989 100644 --- a/components/camel-mail/pom.xml +++ b/components/camel-mail/pom.xml @@ -137,6 +137,35 @@ -Dfile.encoding=UTF-8 + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + + com.sun.mail:javax.mail + + + + + com.sun.mail:javax.mail + + META-INF/javamail.default.address.map + META-INF/javamail.default.providers + + + + true + + + +
[camel-website] branch asf-site updated: Website updated to ae80240
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/camel-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 675abe4 Website updated to ae80240
675abe4 is described below
commit 675abe4627bf5228e0fd1692a1025fec89e6969c
Author: jenkins
AuthorDate: Tue May 28 15:07:21 2019 +
Website updated to ae80240
---
components/latest/aws-s3-component.html| 6 +-
components/latest/file-component.html | 2 +-
components/latest/ftp-component.html | 2 +-
components/latest/ftps-component.html | 2 +-
components/latest/google-mail-component.html | 11 +-
.../latest/google-mail-stream-component.html | 11 +-
components/latest/sftp-component.html | 2 +-
sitemap-camel-k.xml| 42 +-
sitemap-components.xml | 746 ++---
sitemap-manual.xml | 402 +--
10 files changed, 614 insertions(+), 612 deletions(-)
diff --git a/components/latest/aws-s3-component.html
b/components/latest/aws-s3-component.html
index 628b3f6..6dacda0 100644
--- a/components/latest/aws-s3-component.html
+++ b/components/latest/aws-s3-component.html
@@ -1,10 +1,10 @@
Untitled ::
Apache Camelhttps://camel.apache.org/staging/components/latest/aws-s3-component.html;>URI OptionsThe AWS S3
Storage Service component supports 6 options, which are listed
below.URI OptionsThe AWS S3
Storage Service component supports 6 options, which are listed
below.The
component supports 37 options, which are listed below.NameDescriptionDefa [...]
+/dependencyThe
component supports 38 options, which are listed below.NameDescriptionDefa [...]
ClientConfiguration clientConfiguration = new ClientConfiguration();
clientConfiguration.setProxyHost("http://myProxyHost;);
@@ -55,7 +55,7 @@ registry.bind("client", client);
}
})
.to("aws-s3://mycamelbucket?amazonS3Client=#amazonS3Clientoperation=getObject")
- .to("mock:result");This
operation will return an S3Object instance related to the camelKey object in
mycamelbucket bucket.Automatic
detection of AmazonS3 client in registryFrom
Camel 3.0.0-M3 the component will be able to de [...]
+ .to("mock:result");This
operation will return an S3Object instance related to the camelKey object in
mycamelbucket bucket.Bucket AutocreationWith the optionautoCreateBucketusers are able
to avoid the autocreation of an S3 Bucket in case it doesnt exist. The
default [...]
groupIdorg.apache.camel/groupId
artifactIdcamel-aws-s3/artifactId
version${camel-version}/version
diff --git a/components/latest/file-component.html
b/components/latest/file-component.html
index d954c14..66e8235 100644
--- a/components/latest/file-component.html
+++ b/components/latest/file-component.html
@@ -1,4 +1,4 @@
-Untitled ::
Apache Camelhttps://camel.apache.org/staging/components/latest/file-component.html;>Untitled ::
Apache Camelhttps://camel.apache.org/staging/components/latest/file-component.html;>URI formatftp://[username@]hostname[:port]/directoryname[?options]
sftp://[username@]hostname[:port]/directoryname[?options]
-ftps://[username@]hostname[:port]/directoryname[?options]Wheredirectorynamerepresents the
underlying directory. The directory name is a relative path. Absolute
paths isnotsupported. The relative path can contain
nested folders, such as /inbox/us.For Camel
versions beforeCamel 2.16, the directoryName
mustexist already as this com [...]
+ftps://[username@]hostname[:port]/directoryname[?options]Wheredirectorynamerepresents the
underlying directory. The directory name is a relative path. Absolute
paths isnotsupported. The relative path can contain
nested folders, such as /inbox/us.For Camel
versions beforeCamel 2.16, the directoryName
mustexist already as this com [...]
groupIdorg.apache.camel/groupId
artifactIdcamel-ftp-starter/artifactId
versionx.x.x/version
diff --git a/components/latest/ftps-component.html
b/components/latest/ftps-component.html
index 9101913..c92710b 100644
--- a/components/latest/ftps-component.html
+++ b/components/latest/ftps-component.html
@@ -3,7 +3,7 @@
artifactIdcamel-ftp/artifactId
versionx.x.x/version
!-- use the same version as your Camel core version --
-/dependencyFor more
information you can look atFTP
componentURI OptionsThe options below are exclusive for the FTPS
component.The FTPS component supports 3
options, which are listed below.For more
information you can look atFTP
componentURI OptionsThe options below are exclusive for the FTPS
component.The FTPS component supports 3
options, which are listed below.Untitled ::
Apache Camelhttps://camel.apache.org/staging/components/latest/google-mail-component.html;>URI FormatThe GoogleMail Component uses the following
[camel] branch master updated: [CAMEL-13593]avoid “expected resource not found” warnings when using camel-mail in OSGi
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 36cdd36 [CAMEL-13593]avoid “expected resource not found” warnings when using camel-mail in OSGi 36cdd36 is described below commit 36cdd36c715e159923a31b49aa6f5adcf77b8fb5 Author: Freeman Fang AuthorDate: Tue May 28 10:49:48 2019 -0400 [CAMEL-13593]avoid “expected resource not found” warnings when using camel-mail in OSGi --- components/camel-mail/pom.xml | 29 + 1 file changed, 29 insertions(+) diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml index a0621f5..4f6d253 100644 --- a/components/camel-mail/pom.xml +++ b/components/camel-mail/pom.xml @@ -123,6 +123,35 @@ -Dfile.encoding=UTF-8 + +org.apache.maven.plugins +maven-shade-plugin + + +package + +shade + + + + +com.sun.mail:javax.mail + + + + + com.sun.mail:javax.mail + + META-INF/javamail.default.address.map + META-INF/javamail.default.providers + + + +true + + + +
[camel] branch master updated: Upgrade LZ4 Java to version 1.6.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new e2613c9 Upgrade LZ4 Java to version 1.6.0 e2613c9 is described below commit e2613c957f3c9842ea8eac7cc5c0857228bdd58d Author: Andrea Cosentino AuthorDate: Tue May 28 16:11:06 2019 +0200 Upgrade LZ4 Java to version 1.6.0 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index c985357..2829ca1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -460,7 +460,7 @@ [7,8) 0.2.0 0.2.0_1 -1.5.0 +1.6.0 1.6
[camel-k] branch master updated: Fix #644: remove predefined images
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new 9a1999c Fix #644: remove predefined images
9a1999c is described below
commit 9a1999c3286da3e31cf9bc65adbee8df836dceb7
Author: nferraro
AuthorDate: Tue May 28 12:52:15 2019 +0200
Fix #644: remove predefined images
---
.gitignore | 1 -
cmd/util/publisher/publisher.go| 204 -
pkg/platform/images/doc.go | 19
pkg/platform/images/images.go | 89
pkg/platform/images/images_test.go | 86
pkg/trait/images.go| 63
pkg/trait/trait_catalog.go | 6 --
script/Makefile| 11 +-
8 files changed, 2 insertions(+), 477 deletions(-)
diff --git a/.gitignore b/.gitignore
index 48e5116..2513a32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
# Binary files
/camel-k
/kamel
-/publisher
/builder
# Released Packages
diff --git a/cmd/util/publisher/publisher.go b/cmd/util/publisher/publisher.go
deleted file mode 100644
index 2789274..000
--- a/cmd/util/publisher/publisher.go
+++ /dev/null
@@ -1,204 +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 main
-
-import (
- "fmt"
- "io/ioutil"
- "os"
- "os/exec"
- "path"
- "path/filepath"
- "sort"
- "strings"
- "time"
-
- clientscheme "k8s.io/client-go/kubernetes/scheme"
-
- "github.com/apache/camel-k/pkg/apis"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/builder"
- "github.com/apache/camel-k/pkg/platform/images"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/test"
-
- "github.com/pkg/errors"
- "github.com/spf13/cobra"
-)
-
-// PublisherOptions --
-type PublisherOptions struct {
- StartWith string
- EndWithstring
- RuntimeVersion string
- BuildAttempts int
-}
-
-// Publishes predefined images for all Camel components
-func main() {
- options := PublisherOptions{}
-
- var cmd = cobra.Command{
- Use: "publisher",
- Short: "Publisher allows to publish base images before a
release",
- Run: options.run,
- }
-
- cmd.Flags().StringVar(, "start-with", "", "The
component to start with")
- cmd.Flags().StringVar(, "end-with", "", "The component
to end with")
- cmd.Flags().StringVar(, "runtime-version",
defaults.RuntimeVersion, "The runtime version to use")
- cmd.Flags().IntVar(, "attempts", 5, "The maximum
number of build attempts for each image")
-
- panicIfErr(cmd.Execute())
-}
-
-func (options *PublisherOptions) run(_ *cobra.Command, _ []string) {
- scheme := clientscheme.Scheme
- panicIfErr(apis.AddToScheme(scheme))
-
- started := options.StartWith == ""
-
- catalog, err := test.DefaultCatalog()
- if err != nil {
- fmt.Printf("Error retrieveing default catalog: %s", err.Error())
- return
- }
-
- keys := make([]string, 0, len(catalog.Artifacts))
- for k := range catalog.Artifacts {
- keys = append(keys, k)
- }
- sort.Strings(keys)
-
- for _, k := range keys {
- a := catalog.Artifacts[k]
- if a.GroupID == "org.apache.camel" {
- component := strings.TrimPrefix(a.ArtifactID, "camel-")
- if options.StartWith == component {
- started = true
- }
-
- if started {
- fmt.Printf("building component %s\n", component)
- options.buildWithAttempts(component,
options.RuntimeVersion, catalog)
- } else {
- fmt.Printf("skipping component %s\n", component)
- }
-
-
[camel-k] branch master updated: feat: Set env var with Kamel
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new 9fcb17c feat: Set env var with Kamel
9fcb17c is described below
commit 9fcb17cd70a66050d8d760ffb60e3e18705a5b22
Author: James Netherton
AuthorDate: Tue May 28 12:08:59 2019 +0100
feat: Set env var with Kamel
fixes #606
---
README.adoc| 10 +-
pkg/cmd/run.go | 6 +-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/README.adoc b/README.adoc
index d9ecbae..2fb739d 100644
--- a/README.adoc
+++ b/README.adoc
@@ -61,7 +61,7 @@ integration "sample" created
integration "sample" in phase Waiting For Platform
```
-NOTE: It will take some time for your integration to get started for the first
time. This is because the camel-k operator has to pull and cache the camel-k
builder images into the cluster’s registry.
+NOTE: It will take some time for your integration to get started for the first
time. This is because the camel-k operator has to pull and cache the camel-k
builder images into the cluster’s registry.
You can follow this process by watching the pods in the namespace where the
operator is running:
@@ -208,6 +208,14 @@ It's possible to mount persistent volumes into integration
containers by using t
kamel run examples/Sample.java -v myPvcName:/some/path
```
+ Configure Environment Variables
+
+It's possible to configure environment variables for integration containers by
using the `-e` or `--env` flag:
+
+```
+kamel run examples/Sample.java -e MY_ENV_VAR=some-value
+```
+
=== Running Integrations in "Dev" Mode for Fast Feedback
If you want to iterate quickly on an integration to have fast feedback on the
code you're writing, you can use by running it in **"dev" mode**:
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 9fb6e8a..9e3d4a9 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -88,6 +88,7 @@ func newCmdRun(rootCmdOptions *RootCmdOptions) *cobra.Command
{
cmd.Flags().StringSliceVar(, "open-api", nil, "Add an
OpenAPI v2 spec")
cmd.Flags().StringVar(, "deletion-policy",
"owner", "Policy used to cleanup child resources, default owner")
cmd.Flags().StringSliceVarP(, "volume", "v", nil,
"Mount a volume into the integration container. E.g \"-v
pvcname:/container/path\"")
+ cmd.Flags().StringSliceVarP(, "env", "e", nil, "Set an
environment variable in the integration container. E.g \"-e MY_VAR=my-value\"")
// completion support
configureKnownCompletions()
@@ -118,6 +119,7 @@ type runCmdOptions struct {
Traits []string
LoggingLevels []string
Volumes[]string
+ EnvVars[]string
}
func (o *runCmdOptions) validateArgs(_ *cobra.Command, args []string) error {
@@ -377,10 +379,12 @@ func (o *runCmdOptions) updateIntegrationCode(c
client.Client, sources []string)
for _, item := range o.Secrets {
integration.Spec.AddConfiguration("secret", item)
}
-
for _, item := range o.Volumes {
integration.Spec.AddConfiguration("volume", item)
}
+ for _, item := range o.EnvVars {
+ integration.Spec.AddConfiguration("env", item)
+ }
for _, traitConf := range o.Traits {
if err := o.configureTrait(, traitConf); err != nil
{
[camel] 02/02: Update MessageHistory.java
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 47f455564649ec1e700b6da397c02a1f23b0c3cb
Author: bdevido <47347518+bdev...@users.noreply.github.com>
AuthorDate: Tue May 28 14:27:57 2019 +0200
Update MessageHistory.java
CAMEL-13587: Inflight repository browse should compute elapsed if the
message is still inflight at a given node. Thanks to Barbara De Vido for
reporting.
---
camel-core/src/main/java/org/apache/camel/MessageHistory.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/camel-core/src/main/java/org/apache/camel/MessageHistory.java
b/camel-core/src/main/java/org/apache/camel/MessageHistory.java
index 217b9d2..683c7f7 100644
--- a/camel-core/src/main/java/org/apache/camel/MessageHistory.java
+++ b/camel-core/src/main/java/org/apache/camel/MessageHistory.java
@@ -48,6 +48,7 @@ public interface MessageHistory {
/**
* Gets the elapsed time in millis processing the node took
+ * (this is 0 until the node processing is done)
*/
long getElapsed();
[camel] 01/02: Update DefaultInflightRepository.java
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.23.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9e3899f793fdd4add5efda230c0ab2a257663a4b
Author: bdevido <47347518+bdev...@users.noreply.github.com>
AuthorDate: Tue May 28 14:27:17 2019 +0200
Update DefaultInflightRepository.java
CAMEL-13587: Inflight repository browse should compute elapsed if the
message is still inflight at a given node. Thanks to Barbara De Vido for
reporting.
---
.../main/java/org/apache/camel/impl/DefaultInflightRepository.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
b/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
index 7f079ac..9052e65 100644
---
a/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
+++
b/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
@@ -223,7 +223,12 @@ public class DefaultInflightRepository extends
ServiceSupport implements Infligh
// get latest entry
MessageHistory history = list.getLast();
if (history != null) {
-return history.getElapsed();
+long elapsed = history.getElapsed();
+if (elapsed == 0 && history.getTime() > 0) {
+// still in progress, so lets compute it via the start time
+elapsed = System.currentTimeMillis() - history.getTime();
+}
+return elapsed;
} else {
return 0;
}
[camel] branch camel-2.24.x updated (8f9f6e8 -> e327cc4)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-2.24.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 8f9f6e8 [CAMEL-13376]camel-cxf - failure processor for custom exception handling cannot get the original message new 7bb8e27 Update DefaultInflightRepository.java new e327cc4 Update MessageHistory.java 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-core/src/main/java/org/apache/camel/MessageHistory.java | 1 + .../main/java/org/apache/camel/impl/DefaultInflightRepository.java | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-)
[camel] branch camel-2.23.x updated (a7b1103 -> d891566)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-2.23.x in repository https://gitbox.apache.org/repos/asf/camel.git. from a7b1103 [CAMEL-13376]camel-cxf - failure processor for custom exception handling cannot get the original message new 9e3899f Update DefaultInflightRepository.java new d891566 Update MessageHistory.java 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-core/src/main/java/org/apache/camel/MessageHistory.java | 1 + .../main/java/org/apache/camel/impl/DefaultInflightRepository.java | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-)
[camel] branch camel-2.22.x updated (a9f3c7f -> 47f4555)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-2.22.x in repository https://gitbox.apache.org/repos/asf/camel.git. from a9f3c7f [CAMEL-13376]camel-cxf - failure processor for custom exception handling cannot get the original message new d65b7d6 Update DefaultInflightRepository.java new 47f4555 Update MessageHistory.java 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-core/src/main/java/org/apache/camel/MessageHistory.java | 1 + .../main/java/org/apache/camel/impl/DefaultInflightRepository.java | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-)
[camel] 02/02: Update MessageHistory.java
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.23.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d891566a72693c3d7bb8e2b2b3ef03998d2c4f96
Author: bdevido <47347518+bdev...@users.noreply.github.com>
AuthorDate: Tue May 28 14:27:57 2019 +0200
Update MessageHistory.java
CAMEL-13587: Inflight repository browse should compute elapsed if the
message is still inflight at a given node. Thanks to Barbara De Vido for
reporting.
---
camel-core/src/main/java/org/apache/camel/MessageHistory.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/camel-core/src/main/java/org/apache/camel/MessageHistory.java
b/camel-core/src/main/java/org/apache/camel/MessageHistory.java
index 217b9d2..683c7f7 100644
--- a/camel-core/src/main/java/org/apache/camel/MessageHistory.java
+++ b/camel-core/src/main/java/org/apache/camel/MessageHistory.java
@@ -48,6 +48,7 @@ public interface MessageHistory {
/**
* Gets the elapsed time in millis processing the node took
+ * (this is 0 until the node processing is done)
*/
long getElapsed();
[camel] 01/02: Update DefaultInflightRepository.java
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d65b7d62e3ab144cd226f96ba7fee8abf9ce1c30
Author: bdevido <47347518+bdev...@users.noreply.github.com>
AuthorDate: Tue May 28 14:27:17 2019 +0200
Update DefaultInflightRepository.java
CAMEL-13587: Inflight repository browse should compute elapsed if the
message is still inflight at a given node. Thanks to Barbara De Vido for
reporting.
---
.../main/java/org/apache/camel/impl/DefaultInflightRepository.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
b/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
index 7f079ac..9052e65 100644
---
a/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
+++
b/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
@@ -223,7 +223,12 @@ public class DefaultInflightRepository extends
ServiceSupport implements Infligh
// get latest entry
MessageHistory history = list.getLast();
if (history != null) {
-return history.getElapsed();
+long elapsed = history.getElapsed();
+if (elapsed == 0 && history.getTime() > 0) {
+// still in progress, so lets compute it via the start time
+elapsed = System.currentTimeMillis() - history.getTime();
+}
+return elapsed;
} else {
return 0;
}
[camel] 01/02: Update DefaultInflightRepository.java
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.24.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7bb8e2701b39afc9a2bbd55ace58450e5b600acb
Author: bdevido <47347518+bdev...@users.noreply.github.com>
AuthorDate: Tue May 28 14:27:17 2019 +0200
Update DefaultInflightRepository.java
CAMEL-13587: Inflight repository browse should compute elapsed if the
message is still inflight at a given node. Thanks to Barbara De Vido for
reporting.
---
.../main/java/org/apache/camel/impl/DefaultInflightRepository.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
b/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
index 7f079ac..9052e65 100644
---
a/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
+++
b/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
@@ -223,7 +223,12 @@ public class DefaultInflightRepository extends
ServiceSupport implements Infligh
// get latest entry
MessageHistory history = list.getLast();
if (history != null) {
-return history.getElapsed();
+long elapsed = history.getElapsed();
+if (elapsed == 0 && history.getTime() > 0) {
+// still in progress, so lets compute it via the start time
+elapsed = System.currentTimeMillis() - history.getTime();
+}
+return elapsed;
} else {
return 0;
}
[camel] 02/02: Update MessageHistory.java
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.24.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e327cc46d1c19fe656c8ae801015919c5767fd38
Author: bdevido <47347518+bdev...@users.noreply.github.com>
AuthorDate: Tue May 28 14:27:57 2019 +0200
Update MessageHistory.java
CAMEL-13587: Inflight repository browse should compute elapsed if the
message is still inflight at a given node. Thanks to Barbara De Vido for
reporting.
---
camel-core/src/main/java/org/apache/camel/MessageHistory.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/camel-core/src/main/java/org/apache/camel/MessageHistory.java
b/camel-core/src/main/java/org/apache/camel/MessageHistory.java
index 217b9d2..683c7f7 100644
--- a/camel-core/src/main/java/org/apache/camel/MessageHistory.java
+++ b/camel-core/src/main/java/org/apache/camel/MessageHistory.java
@@ -48,6 +48,7 @@ public interface MessageHistory {
/**
* Gets the elapsed time in millis processing the node took
+ * (this is 0 until the node processing is done)
*/
long getElapsed();
[camel] 01/02: Update DefaultInflightRepository.java
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1cf1eb1fe6c9449389fd3125931da334f62aff46
Author: bdevido <47347518+bdev...@users.noreply.github.com>
AuthorDate: Tue May 28 14:27:17 2019 +0200
Update DefaultInflightRepository.java
CAMEL-13587: Inflight repository browse should compute elapsed if the
message is still inflight at a given node. Thanks to Barbara De Vido for
reporting.
---
.../main/java/org/apache/camel/impl/DefaultInflightRepository.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
b/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
index 7f079ac..9052e65 100644
---
a/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
+++
b/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
@@ -223,7 +223,12 @@ public class DefaultInflightRepository extends
ServiceSupport implements Infligh
// get latest entry
MessageHistory history = list.getLast();
if (history != null) {
-return history.getElapsed();
+long elapsed = history.getElapsed();
+if (elapsed == 0 && history.getTime() > 0) {
+// still in progress, so lets compute it via the start time
+elapsed = System.currentTimeMillis() - history.getTime();
+}
+return elapsed;
} else {
return 0;
}
[camel] 02/02: Update MessageHistory.java
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 29c126fd31cf251128c245798740c2b3683ce37e
Author: bdevido <47347518+bdev...@users.noreply.github.com>
AuthorDate: Tue May 28 14:27:57 2019 +0200
Update MessageHistory.java
CAMEL-13587: Inflight repository browse should compute elapsed if the
message is still inflight at a given node. Thanks to Barbara De Vido for
reporting.
---
camel-core/src/main/java/org/apache/camel/MessageHistory.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/camel-core/src/main/java/org/apache/camel/MessageHistory.java
b/camel-core/src/main/java/org/apache/camel/MessageHistory.java
index 217b9d2..683c7f7 100644
--- a/camel-core/src/main/java/org/apache/camel/MessageHistory.java
+++ b/camel-core/src/main/java/org/apache/camel/MessageHistory.java
@@ -48,6 +48,7 @@ public interface MessageHistory {
/**
* Gets the elapsed time in millis processing the node took
+ * (this is 0 until the node processing is done)
*/
long getElapsed();
[camel] branch camel-2.x updated (b209274 -> 29c126f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git. from b209274 [CAMEL-13376]camel-cxf - failure processor for custom exception handling cannot get the original message new 1cf1eb1 Update DefaultInflightRepository.java new 29c126f Update MessageHistory.java 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-core/src/main/java/org/apache/camel/MessageHistory.java | 1 + .../main/java/org/apache/camel/impl/DefaultInflightRepository.java | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-)
[camel] branch master updated: CAMEL-13587: Inflight repository browse should compute elapsed if the message is still inflight at a given node. Thanks to Barbara De Vido for reporting.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 02b2f26 CAMEL-13587: Inflight repository browse should compute
elapsed if the message is still inflight at a given node. Thanks to Barbara De
Vido for reporting.
02b2f26 is described below
commit 02b2f265a57b757155757fc330c1d7108574bcfa
Author: Claus Ibsen
AuthorDate: Tue May 28 14:03:48 2019 +0200
CAMEL-13587: Inflight repository browse should compute elapsed if the
message is still inflight at a given node. Thanks to Barbara De Vido for
reporting.
---
core/camel-api/src/main/java/org/apache/camel/MessageHistory.java | 1 +
.../org/apache/camel/impl/engine/DefaultInflightRepository.java| 7 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/MessageHistory.java
b/core/camel-api/src/main/java/org/apache/camel/MessageHistory.java
index 6086508..93b4fb2 100644
--- a/core/camel-api/src/main/java/org/apache/camel/MessageHistory.java
+++ b/core/camel-api/src/main/java/org/apache/camel/MessageHistory.java
@@ -38,6 +38,7 @@ public interface MessageHistory {
/**
* Gets the elapsed time in millis processing the node took
+ * (this is 0 until the node processing is done)
*/
long getElapsed();
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java
index 516b86e..b05eb90 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java
@@ -212,7 +212,12 @@ public class DefaultInflightRepository extends
ServiceSupport implements Infligh
// get latest entry
MessageHistory history = list.getLast();
if (history != null) {
-return history.getElapsed();
+long elapsed = history.getElapsed();
+if (elapsed == 0 && history.getTime() > 0) {
+// still in progress, so lets compute it via the start time
+elapsed = System.currentTimeMillis() - history.getTime();
+}
+return elapsed;
} else {
return 0;
}
[camel] 01/05: CAMEL-13591 - Camel-AWS S3: Add an option for the autocreation of the bucket
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 47342dbf4a7650c101d44b24a21c1b5404236a9b
Author: Andrea Cosentino
AuthorDate: Tue May 28 13:04:36 2019 +0200
CAMEL-13591 - Camel-AWS S3: Add an option for the autocreation of the bucket
---
.../camel-aws-s3/src/main/docs/aws-s3-component.adoc | 3 ++-
.../apache/camel/component/aws/s3/S3Configuration.java| 15 ++-
.../org/apache/camel/component/aws/s3/S3Endpoint.java | 2 ++
.../component/aws/s3/S3ComponentConfigurationTest.java| 13 +
.../aws/s3/springboot/S3ComponentConfiguration.java | 12
5 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
index e5a3120..23020b4 100644
--- a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
+++ b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
@@ -81,13 +81,14 @@ with the following path and query parameters:
|===
- Query Parameters (52 parameters):
+ Query Parameters (53 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
| *amazonS3Client* (common) | Reference to a
com.amazonaws.services.s3.AmazonS3 in the link:registry.htmlRegistry. | |
AmazonS3
+| *autoCreateBucket* (common) | Setting the autocreation of the bucket | true
| boolean
| *pathStyleAccess* (common) | Whether or not the S3 client should use path
style access | false | boolean
| *policy* (common) | The policy for this queue to set in the
com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method. | | String
| *proxyHost* (common) | To define a proxy host when instantiating the SQS
client | | String
diff --git
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
index 7c71a2f..86f4382 100644
---
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
+++
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
@@ -82,6 +82,8 @@ public class S3Configuration implements Cloneable {
private boolean payloadSigningEnabled;
@UriParam(label = "common, advanced", defaultValue = "false")
private boolean forceGlobalBucketAccessEnabled;
+@UriParam(label = "common", defaultValue = "true")
+private boolean autoCreateBucket = true;
@UriParam(label = "producer,advanced", defaultValue = "false")
private boolean useAwsKMS;
@UriParam(label = "producer,advanced")
@@ -462,7 +464,18 @@ public class S3Configuration implements Cloneable {
return useIAMCredentials;
}
-public boolean hasProxyConfiguration() {
+public boolean isAutoCreateBucket() {
+ return autoCreateBucket;
+ }
+
+/**
+ * Setting the autocreation of the bucket
+ */
+ public void setAutoCreateBucket(boolean autoCreateBucket) {
+ this.autoCreateBucket = autoCreateBucket;
+ }
+
+ public boolean hasProxyConfiguration() {
return ObjectHelper.isNotEmpty(getProxyHost()) &&
ObjectHelper.isNotEmpty(getProxyPort());
}
diff --git
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
index c8cb678..d11aae7 100644
---
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
+++
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
@@ -110,6 +110,7 @@ public class S3Endpoint extends ScheduledPollEndpoint {
LOG.trace("Bucket [{}] doesn't exist yet", bucketName);
+if (getConfiguration().isAutoCreateBucket()) {
// creates the new bucket because it doesn't exist yet
CreateBucketRequest createBucketRequest = new
CreateBucketRequest(getConfiguration().getBucketName());
@@ -118,6 +119,7 @@ public class S3Endpoint extends ScheduledPollEndpoint {
s3Client.createBucket(createBucketRequest);
LOG.trace("Bucket created");
+}
if (configuration.getPolicy() != null) {
LOG.trace("Updating bucket [{}] with policy [{}]", bucketName,
configuration.getPolicy());
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java
index e81a4c0..bde0a75 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java
+++
[camel] 05/05: Regen of Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 5efdabf0060b2faa0ae6e35f62a3d1070c1f7755 Author: Andrea Cosentino AuthorDate: Tue May 28 13:25:42 2019 +0200 Regen of Regen --- components/readme.adoc | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/components/readme.adoc b/components/readme.adoc index a3293e0..ebbbf5f 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -1,7 +1,7 @@ Components // components: START -Number of Components: 293 in 230 JAR artifacts (0 deprecated) +Number of Components: 296 in 233 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -112,6 +112,12 @@ Number of Components: 293 in 230 JAR artifacts (0 deprecated) | link:camel-aws-ses/src/main/docs/aws-ses-component.adoc[AWS Simple Email Service] (camel-aws-ses) + `aws-ses:from` | 2.9 | The aws-ses component is used for sending emails with Amazon's SES service. +| link:camel-aws-sns/src/main/docs/aws-sns-component.adoc[AWS Simple Notification System] (camel-aws-sns) + +`aws-sns:topicNameOrArn` | 2.8 | The aws-sns component is used for sending messages to an Amazon Simple Notification Topic. + +| link:camel-aws-sqs/src/main/docs/aws-sqs-component.adoc[AWS Simple Queue Service] (camel-aws-sqs) + +`aws-sqs:queueNameOrArn` | 2.6 | The aws-sqs component is used for sending and receiving messages to Amazon's SQS service. + | link:camel-aws-swf/src/main/docs/aws-swf-component.adoc[AWS Simple Workflow] (camel-aws-swf) + `aws-swf:type` | 2.13 | The aws-swf component is used for managing workflows from Amazon Simple Workflow. @@ -481,6 +487,9 @@ Number of Components: 293 in 230 JAR artifacts (0 deprecated) | link:camel-jt400/src/main/docs/jt400-component.adoc[JT400] (camel-jt400) + `jt400:userID:password/systemName/objectPath.type` | 1.5 | The jt400 component allows you to exchanges messages with an AS/400 system using data queues or program call. +| link:camel-kafka/src/main/docs/kafka-component.adoc[Kafka] (camel-kafka) + +`kafka:topic` | 2.13 | The kafka component allows messages to be sent to (or consumed from) Apache Kafka brokers. + | link:camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc[Kubernetes ConfigMap] (camel-kubernetes) + `kubernetes-config-maps:masterUrl` | 2.17 | The Kubernetes Configmaps component provides a producer to execute kubernetes configmap operations.
[camel] 02/05: CAMEL-13591 - Fixed CS
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f200caa64648e3878c4b3c4454716744b4257ff2
Author: Andrea Cosentino
AuthorDate: Tue May 28 13:05:59 2019 +0200
CAMEL-13591 - Fixed CS
---
.../camel/component/aws/s3/S3Configuration.java| 34 +++---
.../apache/camel/component/aws/s3/S3Endpoint.java | 13 -
2 files changed, 23 insertions(+), 24 deletions(-)
diff --git
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
index 86f4382..91bc4a2 100644
---
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
+++
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
@@ -96,8 +96,8 @@ public class S3Configuration implements Cloneable {
}
/**
- * Setup the partSize which is used in multi part upload,
- * the default size is 25M.
+ * Setup the partSize which is used in multi part upload, the default size
+ * is 25M.
*/
public void setPartSize(long partSize) {
this.partSize = partSize;
@@ -108,8 +108,8 @@ public class S3Configuration implements Cloneable {
}
/**
- * If it is true, camel will upload the file with multi part
- * format, the part size is decided by the option of `partSize`
+ * If it is true, camel will upload the file with multi part format, the
+ * part size is decided by the option of `partSize`
*/
public void setMultiPartUpload(boolean multiPartUpload) {
this.multiPartUpload = multiPartUpload;
@@ -152,7 +152,7 @@ public class S3Configuration implements Cloneable {
public String getPrefix() {
return prefix;
}
-
+
/**
* The prefix which is used in the
* com.amazonaws.services.s3.model.ListObjectsRequest to only consume
@@ -161,7 +161,7 @@ public class S3Configuration implements Cloneable {
public void setPrefix(String prefix) {
this.prefix = prefix;
}
-
+
public String getDelimiter() {
return delimiter;
}
@@ -285,8 +285,8 @@ public class S3Configuration implements Cloneable {
}
/**
- * Sets the server-side encryption algorithm when encrypting
- * the object using AWS-managed keys. For example use AES256.
+ * Sets the server-side encryption algorithm when encrypting the object
+ * using AWS-managed keys. For example use AES256.
*/
public void setServerSideEncryption(String serverSideEncryption) {
this.serverSideEncryption = serverSideEncryption;
@@ -453,8 +453,8 @@ public class S3Configuration implements Cloneable {
}
/**
- * Set whether the S3 client should expect to load credentials on an EC2
instance or to
- * expect static credentials to be passed in.
+ * Set whether the S3 client should expect to load credentials on an EC2
+ * instance or to expect static credentials to be passed in.
*/
public void setUseIAMCredentials(Boolean useIAMCredentials) {
this.useIAMCredentials = useIAMCredentials;
@@ -465,20 +465,20 @@ public class S3Configuration implements Cloneable {
}
public boolean isAutoCreateBucket() {
- return autoCreateBucket;
- }
+return autoCreateBucket;
+}
/**
* Setting the autocreation of the bucket
*/
- public void setAutoCreateBucket(boolean autoCreateBucket) {
- this.autoCreateBucket = autoCreateBucket;
- }
+public void setAutoCreateBucket(boolean autoCreateBucket) {
+this.autoCreateBucket = autoCreateBucket;
+}
- public boolean hasProxyConfiguration() {
+public boolean hasProxyConfiguration() {
return ObjectHelper.isNotEmpty(getProxyHost()) &&
ObjectHelper.isNotEmpty(getProxyPort());
}
-
+
// *
//
// *
diff --git
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
index d11aae7..d1c5a7b 100644
---
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
+++
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
@@ -82,8 +82,7 @@ public class S3Endpoint extends ScheduledPollEndpoint {
public void doStart() throws Exception {
super.doStart();
-s3Client = configuration.getAmazonS3Client() != null ?
configuration.getAmazonS3Client()
-: S3ClientFactory.getAWSS3Client(configuration,
getMaxConnections()).getS3Client();
+s3Client =
[camel] 03/05: CAMEL-13591 - Docs
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 3baeec0046794c83046d790698cf39f14961ba55 Author: Andrea Cosentino AuthorDate: Tue May 28 13:08:38 2019 +0200 CAMEL-13591 - Docs --- components/camel-aws-s3/src/main/docs/aws-s3-component.adoc | 5 + 1 file changed, 5 insertions(+) diff --git a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc index 23020b4..a4f9757 100644 --- a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc +++ b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc @@ -506,6 +506,11 @@ This operation will list the objects in the mycamelbucket bucket This operation will return an S3Object instance related to the camelKey object in mycamelbucket bucket. +### Bucket Autocreation + +With the option `autoCreateBucket` users are able to avoid the autocreation of an S3 Bucket in case it doesn't exist. The default for this option is `true`. +If set to false any operation on a not-existent bucket in AWS won't be successful and an error will be returned. + ### Automatic detection of AmazonS3 client in registry From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonS3 bean into the registry.
[camel] branch master updated (e244720 -> 5efdabf)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from e244720 Regen docs new 47342db CAMEL-13591 - Camel-AWS S3: Add an option for the autocreation of the bucket new f200caa CAMEL-13591 - Fixed CS new 3baeec0 CAMEL-13591 - Docs new f69e4da Regen new 5efdabf Regen of Regen 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: .../src/main/docs/aws-s3-component.adoc| 11 +-- .../camel/component/aws/s3/S3Configuration.java| 35 +++--- .../apache/camel/component/aws/s3/S3Endpoint.java | 15 +- .../aws/s3/S3ComponentConfigurationTest.java | 13 .../modules/ROOT/pages/aws-s3-component.adoc | 11 +-- .../s3/springboot/S3ComponentConfiguration.java| 12 6 files changed, 75 insertions(+), 22 deletions(-)
[camel] 04/05: Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit f69e4daad97b68de676f2136122c58699818e9d2 Author: Andrea Cosentino AuthorDate: Tue May 28 13:13:47 2019 +0200 Regen --- components/camel-aws-s3/src/main/docs/aws-s3-component.adoc | 3 ++- components/readme.adoc | 11 +-- docs/components/modules/ROOT/pages/aws-s3-component.adoc| 11 +-- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc index a4f9757..dc540dd 100644 --- a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc +++ b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc @@ -158,7 +158,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s -The component supports 37 options, which are listed below. +The component supports 38 options, which are listed below. @@ -170,6 +170,7 @@ The component supports 37 options, which are listed below. | *camel.component.aws-s3.configuration.accelerate-mode-enabled* | Define if Accelerate Mode enabled is true or false | false | Boolean | *camel.component.aws-s3.configuration.access-key* | Amazon AWS Access Key | | String | *camel.component.aws-s3.configuration.amazon-s3-client* | Reference to a `com.amazonaws.services.s3.AmazonS3` in the link:registry.html[Registry]. | | AmazonS3 +| *camel.component.aws-s3.configuration.auto-create-bucket* | Setting the autocreation of the bucket | true | Boolean | *camel.component.aws-s3.configuration.autoclose-body* | If this option is true and includeBody is true, then the S3Object.close() method will be called on exchange completion. This option is strongly related to includeBody option. In case of setting includeBody to true and autocloseBody to false, it will be up to the caller to close the S3Object stream. Setting autocloseBody to true, will close the S3Object stream automatically. | true | Boolean | *camel.component.aws-s3.configuration.aws-k-m-s-key-id* | Define the id of KMS key to use in case KMS is enabled | | String | *camel.component.aws-s3.configuration.bucket-name* | Name of the bucket. The bucket will be created if it doesn't already exists. | | String diff --git a/components/readme.adoc b/components/readme.adoc index ebbbf5f..a3293e0 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -1,7 +1,7 @@ Components // components: START -Number of Components: 296 in 233 JAR artifacts (0 deprecated) +Number of Components: 293 in 230 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -112,12 +112,6 @@ Number of Components: 296 in 233 JAR artifacts (0 deprecated) | link:camel-aws-ses/src/main/docs/aws-ses-component.adoc[AWS Simple Email Service] (camel-aws-ses) + `aws-ses:from` | 2.9 | The aws-ses component is used for sending emails with Amazon's SES service. -| link:camel-aws-sns/src/main/docs/aws-sns-component.adoc[AWS Simple Notification System] (camel-aws-sns) + -`aws-sns:topicNameOrArn` | 2.8 | The aws-sns component is used for sending messages to an Amazon Simple Notification Topic. - -| link:camel-aws-sqs/src/main/docs/aws-sqs-component.adoc[AWS Simple Queue Service] (camel-aws-sqs) + -`aws-sqs:queueNameOrArn` | 2.6 | The aws-sqs component is used for sending and receiving messages to Amazon's SQS service. - | link:camel-aws-swf/src/main/docs/aws-swf-component.adoc[AWS Simple Workflow] (camel-aws-swf) + `aws-swf:type` | 2.13 | The aws-swf component is used for managing workflows from Amazon Simple Workflow. @@ -487,9 +481,6 @@ Number of Components: 296 in 233 JAR artifacts (0 deprecated) | link:camel-jt400/src/main/docs/jt400-component.adoc[JT400] (camel-jt400) + `jt400:userID:password/systemName/objectPath.type` | 1.5 | The jt400 component allows you to exchanges messages with an AS/400 system using data queues or program call. -| link:camel-kafka/src/main/docs/kafka-component.adoc[Kafka] (camel-kafka) + -`kafka:topic` | 2.13 | The kafka component allows messages to be sent to (or consumed from) Apache Kafka brokers. - | link:camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc[Kubernetes ConfigMap] (camel-kubernetes) + `kubernetes-config-maps:masterUrl` | 2.17 | The Kubernetes Configmaps component provides a producer to execute kubernetes configmap operations. diff --git a/docs/components/modules/ROOT/pages/aws-s3-component.adoc b/docs/components/modules/ROOT/pages/aws-s3-component.adoc index e5a3120..dc540dd 100644 --- a/docs/components/modules/ROOT/pages/aws-s3-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-s3-component.adoc @@ -81,13 +81,14 @@ with the following path and query parameters: |=== - Query Parameters (52
[camel] branch master updated (ef6a02f -> e244720)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from ef6a02f Regen new 97ecdff Camel-google-mail/stream: Update docs new e244720 Regen docs 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: .../src/main/docs/google-mail-component.adoc| 12 ++-- .../src/main/docs/google-mail-stream-component.adoc | 13 ++--- .../modules/ROOT/pages/google-mail-component.adoc | 12 ++-- .../modules/ROOT/pages/google-mail-stream-component.adoc| 13 ++--- 4 files changed, 24 insertions(+), 26 deletions(-)
[camel] 01/02: Camel-google-mail/stream: Update docs
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 97ecdffdba3d5a4dad79cb59a1dbbb6f831f658d Author: Andrea Cosentino AuthorDate: Tue May 28 12:44:28 2019 +0200 Camel-google-mail/stream: Update docs --- .../src/main/docs/google-mail-component.adoc| 12 ++-- .../src/main/docs/google-mail-stream-component.adoc | 13 ++--- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/components/camel-google-mail/src/main/docs/google-mail-component.adoc b/components/camel-google-mail/src/main/docs/google-mail-component.adoc index b840c08..56b0bc2 100644 --- a/components/camel-google-mail/src/main/docs/google-mail-component.adoc +++ b/components/camel-google-mail/src/main/docs/google-mail-component.adoc @@ -22,12 +22,12 @@ Maven users will need to add the following dependency to their pom.xml for this component: -- - -org.apache.camel -camel-google-mail -2.15-SNAPSHOT - - + +org.apache.camel +camel-google-mail + +x.y.z + -- ### URI Format diff --git a/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc b/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc index a50f0e1..fce71b5 100644 --- a/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc +++ b/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc @@ -22,12 +22,12 @@ Maven users will need to add the following dependency to their pom.xml for this component: -- - -org.apache.camel -camel-google-mail -2.22-SNAPSHOT - - + +org.apache.camel +camel-google-mail + +x.y.z + -- ### URI Format @@ -36,7 +36,6 @@ The GoogleMail Component uses the following URI format: google-mail-stream://index?[options] - ### GoogleMailStreamComponent
[camel] 02/02: Regen docs
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit e2447205ad735f84eb28f1b23285408572784f83 Author: Andrea Cosentino AuthorDate: Tue May 28 12:44:54 2019 +0200 Regen docs --- .../modules/ROOT/pages/google-mail-component.adoc | 12 ++-- .../modules/ROOT/pages/google-mail-stream-component.adoc| 13 ++--- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/docs/components/modules/ROOT/pages/google-mail-component.adoc b/docs/components/modules/ROOT/pages/google-mail-component.adoc index b840c08..56b0bc2 100644 --- a/docs/components/modules/ROOT/pages/google-mail-component.adoc +++ b/docs/components/modules/ROOT/pages/google-mail-component.adoc @@ -22,12 +22,12 @@ Maven users will need to add the following dependency to their pom.xml for this component: -- - -org.apache.camel -camel-google-mail -2.15-SNAPSHOT - - + +org.apache.camel +camel-google-mail + +x.y.z + -- ### URI Format diff --git a/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc b/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc index a50f0e1..fce71b5 100644 --- a/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc +++ b/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc @@ -22,12 +22,12 @@ Maven users will need to add the following dependency to their pom.xml for this component: -- - -org.apache.camel -camel-google-mail -2.22-SNAPSHOT - - + +org.apache.camel +camel-google-mail + +x.y.z + -- ### URI Format @@ -36,7 +36,6 @@ The GoogleMail Component uses the following URI format: google-mail-stream://index?[options] - ### GoogleMailStreamComponent
[camel] 01/02: Removed not used property placeholder for jaxen-version
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit caefc1b9418a0c0e43bc8aedc0c42deb0846f63f
Author: Andrea Cosentino
AuthorDate: Tue May 28 12:01:32 2019 +0200
Removed not used property placeholder for jaxen-version
---
parent/pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 6cc5313..c985357 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -354,7 +354,6 @@
${jakarta-jaxb-version}
0.1.6
2.4
-1.1.6
7.22.0.Final
1.0.0.Final
3.3.2.Final
[camel] branch master updated (1ee48a3 -> ef6a02f)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 1ee48a3 Removed not used property placeholder for commons-configuration-bundle-version new caefc1b Removed not used property placeholder for jaxen-version new ef6a02f Regen 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: docs/components/modules/ROOT/pages/file-component.adoc | 3 ++- docs/components/modules/ROOT/pages/ftp-component.adoc | 4 +--- docs/components/modules/ROOT/pages/ftps-component.adoc | 4 +--- docs/components/modules/ROOT/pages/sftp-component.adoc | 4 +--- parent/pom.xml | 1 - 5 files changed, 5 insertions(+), 11 deletions(-)
[camel] 02/02: Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit ef6a02fa77d2090900141baf1f4ec5883456a47d Author: Andrea Cosentino AuthorDate: Tue May 28 12:32:10 2019 +0200 Regen --- docs/components/modules/ROOT/pages/file-component.adoc | 3 ++- docs/components/modules/ROOT/pages/ftp-component.adoc | 4 +--- docs/components/modules/ROOT/pages/ftps-component.adoc | 4 +--- docs/components/modules/ROOT/pages/sftp-component.adoc | 4 +--- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/docs/components/modules/ROOT/pages/file-component.adoc b/docs/components/modules/ROOT/pages/file-component.adoc index e822f50..54d4b1b 100644 --- a/docs/components/modules/ROOT/pages/file-component.adoc +++ b/docs/components/modules/ROOT/pages/file-component.adoc @@ -85,7 +85,7 @@ with the following path and query parameters: |=== - Query Parameters (88 parameters): + Query Parameters (89 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -113,6 +113,7 @@ with the following path and query parameters: | *probeContentType* (consumer) | Whether to enable probing of the content type. If enable then the consumer uses Files#probeContentType(java.nio.file.Path) to determine the content-type of the file, and store that as a header with key Exchange#FILE_CONTENT_TYPE on the Message. | false | boolean | *processStrategy* (consumer) | A pluggable org.apache.camel.component.file.GenericFileProcessStrategy allowing you to implement your own readLock option or similar. Can also be used when special conditions must be met before a file can be consumed, such as a special ready file exists. If this option is set then the readLock option does not apply. | | GenericFileProcess Strategy | *startingDirectoryMustExist* (consumer) | Whether the starting directory must exist. Mind that the autoCreate option is default enabled, which means the starting directory is normally auto created if it doesn't exist. You can disable autoCreate and enable this to ensure the starting directory must exist. Will thrown an exception if the directory doesn't exist. | false | boolean +| *startingDirectoryMustHave Access* (consumer) | Whether the starting directory has access permissions. Mind that the startingDirectoryMustExist parameter must be set to true in order to verify that the directory exists. Will thrown an exception if the directory doesn't have read and write permissions. | false | boolean | *fileExist* (producer) | What to do if a file already exists with the same name. Override, which is the default, replaces the existing file. Append - adds content to the existing file. Fail - throws a GenericFileOperationException, indicating that there is already an existing file. Ignore - silently ignores the problem and does not override the existing file, but assumes everything is okay. Move - option requires to use the moveExisting option to be configured as well. The option eager [...] | *flatten* (producer) | Flatten is used to flatten the file name path to strip any leading paths, so it's just the file name. This allows you to consume recursively into sub-directories, but when you eg write the files to another directory they will be written in a single directory. Setting this to true on the producer enforces that any file name in CamelFileName header will be stripped for any leading paths. | false | boolean | *jailStartingDirectory* (producer) | Used for jailing (restricting) writing files to the starting directory (and sub) only. This is enabled by default to not allow Camel to write files to outside directories (to be more secured out of the box). You can turn this off to allow writing files to directories outside the starting directory, such as parent or root folders. | true | boolean diff --git a/docs/components/modules/ROOT/pages/ftp-component.adoc b/docs/components/modules/ROOT/pages/ftp-component.adoc index a48b3ee..229b955 100644 --- a/docs/components/modules/ROOT/pages/ftp-component.adoc +++ b/docs/components/modules/ROOT/pages/ftp-component.adoc @@ -109,7 +109,7 @@ with the following path and query parameters: |=== - Query Parameters (111 parameters): + Query Parameters (109 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -136,7 +136,6 @@ with the following path and query parameters: | *resumeDownload* (consumer) | Configures whether resume download is enabled. This must be supported by the FTP server (almost all FTP servers support it). In addition the options localWorkDirectory must be configured so downloaded files are stored in a local directory, and the option binary must be enabled, which is required to support resuming of downloads. | false | boolean | *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no
[camel-k] branch master updated: chore: disable modules when invoking go clean
This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/master by this push: new 291562a chore: disable modules when invoking go clean 291562a is described below commit 291562aab658ba1bca2d40a3e159df70156e493e Author: lburgazzoli AuthorDate: Tue May 28 11:37:30 2019 +0200 chore: disable modules when invoking go clean --- script/Makefile | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/script/Makefile b/script/Makefile index 38eb164..ba625fa 100644 --- a/script/Makefile +++ b/script/Makefile @@ -81,7 +81,15 @@ build-compile-integration-tests: go test -c -tags=integration ./test/*.go clean: - go clean + # go clean fails if modules support are turned on as it tries to + # resolve modules, if module support is turned off, it does not + # care about modules and simply deletes bits. + # + # For more info: + # + # https://github.com/golang/go/commit/9238a8ffe12b6eb44aab12de1b861c0f045da8b7 + # + GO111MODULE=off go clean rm -f camel-k rm -f kamel rm -f publisher
[camel-k] branch master updated: chore: fix lint finding
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new c30bd01 chore: fix lint finding
c30bd01 is described below
commit c30bd01bc0ca81e6884b872913c531c9c3ccbb98
Author: lburgazzoli
AuthorDate: Tue May 28 07:09:41 2019 +0200
chore: fix lint finding
---
pkg/apis/camel/v1alpha1/common_types_support.go | 1 -
pkg/apis/camel/v1alpha1/integration_types_support.go | 4 ++--
pkg/trait/deployment.go | 8
pkg/trait/knative.go | 2 +-
pkg/trait/trait_catalog.go | 3 ++-
pkg/trait/util.go| 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pkg/apis/camel/v1alpha1/common_types_support.go
b/pkg/apis/camel/v1alpha1/common_types_support.go
index 2e45408..364150e 100644
--- a/pkg/apis/camel/v1alpha1/common_types_support.go
+++ b/pkg/apis/camel/v1alpha1/common_types_support.go
@@ -39,4 +39,3 @@ func (flows Flows) Serialize() (string, error) {
}
return string(res), nil
}
-
diff --git a/pkg/apis/camel/v1alpha1/integration_types_support.go
b/pkg/apis/camel/v1alpha1/integration_types_support.go
index b008864..e7e089c 100644
--- a/pkg/apis/camel/v1alpha1/integration_types_support.go
+++ b/pkg/apis/camel/v1alpha1/integration_types_support.go
@@ -85,8 +85,8 @@ func (is *IntegrationSpec) AddDependency(dependency string) {
is.Dependencies = make([]string, 0)
}
newDep := dependency
- if (strings.HasPrefix(newDep, "camel-")) {
- newDep = "camel:"+strings.TrimPrefix(dependency, "camel-")
+ if strings.HasPrefix(newDep, "camel-") {
+ newDep = "camel:" + strings.TrimPrefix(dependency, "camel-")
}
for _, d := range is.Dependencies {
if d == newDep {
diff --git a/pkg/trait/deployment.go b/pkg/trait/deployment.go
index 91bf938..a6cc1c4 100644
--- a/pkg/trait/deployment.go
+++ b/pkg/trait/deployment.go
@@ -144,9 +144,9 @@ func (t *deploymentTrait) getDeploymentFor(e *Environment)
*appsv1.Deployment {
APIVersion: appsv1.SchemeGroupVersion.String(),
},
ObjectMeta: metav1.ObjectMeta{
- Name: e.Integration.Name,
- Namespace: e.Integration.Namespace,
- Labels: labels,
+ Name:e.Integration.Name,
+ Namespace: e.Integration.Namespace,
+ Labels: labels,
Annotations: annotations,
},
Spec: appsv1.DeploymentSpec{
@@ -156,7 +156,7 @@ func (t *deploymentTrait) getDeploymentFor(e *Environment)
*appsv1.Deployment {
},
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
- Labels: labels,
+ Labels: labels,
Annotations: annotations,
},
Spec: corev1.PodSpec{
diff --git a/pkg/trait/knative.go b/pkg/trait/knative.go
index 6b15d24..698bee5 100644
--- a/pkg/trait/knative.go
+++ b/pkg/trait/knative.go
@@ -195,7 +195,7 @@ func (t *knativeTrait) configureChannels(e *Environment,
env *knativeapi.CamelEn
Port:8080,
Protocol:knativeapi.CamelProtocolHTTP,
ServiceType: knativeapi.CamelServiceTypeChannel,
- Metadata: meta,
+ Metadata:meta,
}
env.Services = append(env.Services, svc)
}
diff --git a/pkg/trait/trait_catalog.go b/pkg/trait/trait_catalog.go
index 54b1850..ca36acb 100644
--- a/pkg/trait/trait_catalog.go
+++ b/pkg/trait/trait_catalog.go
@@ -266,7 +266,8 @@ func (c *Catalog) configureTraits(traits
map[string]v1alpha1.TraitSpec) error {
for id, traitSpec := range traits {
catTrait := c.GetTrait(id)
if catTrait != nil {
- if err := decodeTraitSpec(, catTrait); err !=
nil {
+ trait := traitSpec
+ if err := decodeTraitSpec(, catTrait); err != nil
{
return err
}
}
diff --git a/pkg/trait/util.go b/pkg/trait/util.go
index 4355c8d..fea765d 100644
--- a/pkg/trait/util.go
+++ b/pkg/trait/util.go
@@ -141,7 +141,7 @@ func FilterTransferableAnnotations(annotations
map[string]string) map[string]str
// filter out kubectl annotations
continue
}
-
[camel-k] branch master updated: chore: include build info in camel-k operator
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new cc0e15c chore: include build info in camel-k operator
cc0e15c is described below
commit cc0e15c7d4046f90b22355486cca3e3b2af3b9ce
Author: lburgazzoli
AuthorDate: Tue May 28 07:04:49 2019 +0200
chore: include build info in camel-k operator
---
cmd/manager/main.go | 4
script/Makefile | 6 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index d22aef8..ee3ccb3 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -28,6 +28,7 @@ import (
"github.com/apache/camel-k/pkg/apis"
"github.com/apache/camel-k/pkg/controller"
+ "github.com/apache/camel-k/pkg/util/defaults"
"github.com/operator-framework/operator-sdk/pkg/k8sutil"
"github.com/operator-framework/operator-sdk/pkg/leader"
"github.com/operator-framework/operator-sdk/pkg/ready"
@@ -41,11 +42,14 @@ import (
)
var log = logf.Log.WithName("cmd")
+var GitCommit string
func printVersion() {
log.Info(fmt.Sprintf("Go Version: %s", runtime.Version()))
log.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH))
log.Info(fmt.Sprintf("operator-sdk Version: %v", sdkVersion.Version))
+ log.Info(fmt.Sprintf("Camel K Operator Version: %v", defaults.Version))
+ log.Info(fmt.Sprintf("Camel K Git Commit: %v", GitCommit))
}
func main() {
diff --git a/script/Makefile b/script/Makefile
index 06c56ec..38eb164 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -7,6 +7,10 @@ BASE_IMAGE := fabric8/s2i-java:3.0-java8
LOCAL_REPOSITORY := /tmp/artifacts/m2
IMAGE_NAME := docker.io/apache/camel-k
RELEASE_GIT_REMOTE := upstream
+GIT_COMMIT := $(shell git rev-list -1 HEAD)
+
+GOLDFLAGS += -X main.GitCommit=$(GIT_COMMIT)
+GOFLAGS = -ldflags "$(GOLDFLAGS)"
default: test
@@ -54,7 +58,7 @@ test-integration: build
go test ./... -tags=integration
build-operator:
- go build -o camel-k ./cmd/manager/*.go
+ go build $(GOFLAGS) -o camel-k ./cmd/manager/*.go
build-kamel:
go build -o kamel ./cmd/kamel/*.go
[camel-k] branch master updated: chore: remove spring-boot leftovers
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new ab45ff9 chore: remove spring-boot leftovers
ab45ff9 is described below
commit ab45ff96a504bf6148e1b88a60339be5112a6050
Author: lburgazzoli
AuthorDate: Tue May 28 06:44:18 2019 +0200
chore: remove spring-boot leftovers
---
build/maven/pom-runtime.xml | 10 --
deploy/platform-integration-context-spring-boot.yaml | 18 --
2 files changed, 28 deletions(-)
diff --git a/build/maven/pom-runtime.xml b/build/maven/pom-runtime.xml
index 851e4d3..8daf84c 100644
--- a/build/maven/pom-runtime.xml
+++ b/build/maven/pom-runtime.xml
@@ -70,16 +70,6 @@
org.apache.camel.k
-camel-k-runtime-spring-boot
-${runtime.version}
-
-
-org.apache.camel.k
-camel-k-runtime-spring-boot-layout
-${runtime.version}
-
-
-org.apache.camel.k
camel-k-adapter-camel-2
${runtime.version}
diff --git a/deploy/platform-integration-context-spring-boot.yaml
b/deploy/platform-integration-context-spring-boot.yaml
deleted file mode 100644
index 5b86911..000
--- a/deploy/platform-integration-context-spring-boot.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: camel.apache.org/v1alpha1
-kind: IntegrationContext
-metadata:
- name: spring-boot
- labels:
-app: "camel-k"
-camel.apache.org/context.created.by.kind: Operator
-camel.apache.org/context.created.by.name: camel-k-operator
-camel.apache.org/context.type: platform
-spec:
- dependencies:
-- runtime:jvm
-- runtime:spring-boot
-- camel:core
- traits:
-springboot:
- configuration:
-enabled: "true"
[camel-k-runtime] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/master by this push: new 7109c82 [maven-release-plugin] prepare for next development iteration 7109c82 is described below commit 7109c8207b3e33e2f6fbec6c9425087d93353481 Author: Andrea Cosentino AuthorDate: Tue May 28 11:23:13 2019 +0200 [maven-release-plugin] prepare for next development iteration --- camel-k-adapter-camel-2/pom.xml | 2 +- camel-k-adapter-camel-3/pom.xml | 2 +- camel-k-maven-plugin/pom.xml | 2 +- camel-k-runtime-bom/pom.xml | 4 ++-- camel-k-runtime-core/pom.xml | 2 +- camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml | 2 +- camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml | 2 +- camel-k-runtime-examples/pom.xml | 2 +- camel-k-runtime-groovy/pom.xml | 2 +- camel-k-runtime-health/pom.xml | 2 +- camel-k-runtime-jvm/pom.xml | 2 +- camel-k-runtime-kotlin/pom.xml | 2 +- camel-k-runtime-servlet/pom.xml | 2 +- camel-k-runtime-yaml/pom.xml | 2 +- camel-knative-http/pom.xml | 2 +- camel-knative/pom.xml| 2 +- distribution/pom.xml | 2 +- pom.xml | 4 ++-- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/camel-k-adapter-camel-2/pom.xml b/camel-k-adapter-camel-2/pom.xml index 12f64ef..256a7e4 100644 --- a/camel-k-adapter-camel-2/pom.xml +++ b/camel-k-adapter-camel-2/pom.xml @@ -21,7 +21,7 @@ org.apache.camel.k camel-k-runtime-parent -0.3.3 +0.3.4-SNAPSHOT 4.0.0 diff --git a/camel-k-adapter-camel-3/pom.xml b/camel-k-adapter-camel-3/pom.xml index f99254e..4342c15 100644 --- a/camel-k-adapter-camel-3/pom.xml +++ b/camel-k-adapter-camel-3/pom.xml @@ -21,7 +21,7 @@ org.apache.camel.k camel-k-runtime-parent -0.3.3 +0.3.4-SNAPSHOT 4.0.0 diff --git a/camel-k-maven-plugin/pom.xml b/camel-k-maven-plugin/pom.xml index cda0922..58894b5 100644 --- a/camel-k-maven-plugin/pom.xml +++ b/camel-k-maven-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.camel.k camel-k-runtime-parent -0.3.3 +0.3.4-SNAPSHOT 4.0.0 diff --git a/camel-k-runtime-bom/pom.xml b/camel-k-runtime-bom/pom.xml index 87271c3..85ac109 100644 --- a/camel-k-runtime-bom/pom.xml +++ b/camel-k-runtime-bom/pom.xml @@ -28,7 +28,7 @@ 4.0.0 org.apache.camel.k camel-k-runtime-bom -0.3.3 +0.3.4-SNAPSHOT pom @@ -57,7 +57,7 @@ scm:git:http://gitbox.apache.org/repos/asf/camel-k-runtime.git scm:git:https://gitbox.apache.org/repos/asf/camel-k-runtime.git https://gitbox.apache.org/repos/asf?p=camel-k-runtime.git;a=summary -camel-k-runtime-parent-0.3.3 +camel-k-runtime-parent-0.3.2 diff --git a/camel-k-runtime-core/pom.xml b/camel-k-runtime-core/pom.xml index 2fd3324..a6e49e8 100644 --- a/camel-k-runtime-core/pom.xml +++ b/camel-k-runtime-core/pom.xml @@ -21,7 +21,7 @@ org.apache.camel.k camel-k-runtime-parent -0.3.3 +0.3.4-SNAPSHOT 4.0.0 diff --git a/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml b/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml index 0a3fde4..96a872d 100644 --- a/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml +++ b/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml @@ -21,7 +21,7 @@ org.apache.camel.k camel-k-runtime-examples -0.3.3 +0.3.4-SNAPSHOT 4.0.0 diff --git a/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml b/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml index 7d48704..629cf87 100644 --- a/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml +++ b/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml @@ -21,7 +21,7 @@ org.apache.camel.k camel-k-runtime-examples -0.3.3 +0.3.4-SNAPSHOT 4.0.0 diff --git a/camel-k-runtime-examples/pom.xml b/camel-k-runtime-examples/pom.xml index 4a1d383..c2ef464 100644 --- a/camel-k-runtime-examples/pom.xml +++ b/camel-k-runtime-examples/pom.xml @@ -21,7 +21,7 @@ org.apache.camel.k
[camel-k-runtime] annotated tag camel-k-runtime-parent-0.3.3 created (now de5909a)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to annotated tag camel-k-runtime-parent-0.3.3 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. at de5909a (tag) tagging 180de44de831098c5edad0e74c0d1ba824b20a42 (commit) replaces camel-k-runtime-parent-0.3.2 by Andrea Cosentino on Tue May 28 11:22:58 2019 +0200 - Log - [maven-release-plugin] copy for tag camel-k-runtime-parent-0.3.3 --- No new revisions were added by this update.
[camel-k-runtime] branch master updated: [maven-release-plugin] prepare release camel-k-runtime-parent-0.3.3
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/master by this push: new 180de44 [maven-release-plugin] prepare release camel-k-runtime-parent-0.3.3 180de44 is described below commit 180de44de831098c5edad0e74c0d1ba824b20a42 Author: Andrea Cosentino AuthorDate: Tue May 28 11:20:48 2019 +0200 [maven-release-plugin] prepare release camel-k-runtime-parent-0.3.3 --- camel-k-adapter-camel-2/pom.xml | 2 +- camel-k-adapter-camel-3/pom.xml | 2 +- camel-k-maven-plugin/pom.xml | 2 +- camel-k-runtime-bom/pom.xml | 4 ++-- camel-k-runtime-core/pom.xml | 2 +- camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml | 2 +- camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml | 2 +- camel-k-runtime-examples/pom.xml | 2 +- camel-k-runtime-groovy/pom.xml | 2 +- camel-k-runtime-health/pom.xml | 2 +- camel-k-runtime-jvm/pom.xml | 2 +- camel-k-runtime-kotlin/pom.xml | 2 +- camel-k-runtime-servlet/pom.xml | 2 +- camel-k-runtime-yaml/pom.xml | 2 +- camel-knative-http/pom.xml | 2 +- camel-knative/pom.xml| 2 +- distribution/pom.xml | 2 +- pom.xml | 4 ++-- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/camel-k-adapter-camel-2/pom.xml b/camel-k-adapter-camel-2/pom.xml index 00f11ec..12f64ef 100644 --- a/camel-k-adapter-camel-2/pom.xml +++ b/camel-k-adapter-camel-2/pom.xml @@ -21,7 +21,7 @@ org.apache.camel.k camel-k-runtime-parent -0.3.3-SNAPSHOT +0.3.3 4.0.0 diff --git a/camel-k-adapter-camel-3/pom.xml b/camel-k-adapter-camel-3/pom.xml index adea071..f99254e 100644 --- a/camel-k-adapter-camel-3/pom.xml +++ b/camel-k-adapter-camel-3/pom.xml @@ -21,7 +21,7 @@ org.apache.camel.k camel-k-runtime-parent -0.3.3-SNAPSHOT +0.3.3 4.0.0 diff --git a/camel-k-maven-plugin/pom.xml b/camel-k-maven-plugin/pom.xml index 4975567..cda0922 100644 --- a/camel-k-maven-plugin/pom.xml +++ b/camel-k-maven-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.camel.k camel-k-runtime-parent -0.3.3-SNAPSHOT +0.3.3 4.0.0 diff --git a/camel-k-runtime-bom/pom.xml b/camel-k-runtime-bom/pom.xml index 402ec03..87271c3 100644 --- a/camel-k-runtime-bom/pom.xml +++ b/camel-k-runtime-bom/pom.xml @@ -28,7 +28,7 @@ 4.0.0 org.apache.camel.k camel-k-runtime-bom -0.3.3-SNAPSHOT +0.3.3 pom @@ -57,7 +57,7 @@ scm:git:http://gitbox.apache.org/repos/asf/camel-k-runtime.git scm:git:https://gitbox.apache.org/repos/asf/camel-k-runtime.git https://gitbox.apache.org/repos/asf?p=camel-k-runtime.git;a=summary -camel-k-runtime-parent-0.3.2 +camel-k-runtime-parent-0.3.3 diff --git a/camel-k-runtime-core/pom.xml b/camel-k-runtime-core/pom.xml index c6f0797..2fd3324 100644 --- a/camel-k-runtime-core/pom.xml +++ b/camel-k-runtime-core/pom.xml @@ -21,7 +21,7 @@ org.apache.camel.k camel-k-runtime-parent -0.3.3-SNAPSHOT +0.3.3 4.0.0 diff --git a/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml b/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml index e2d788f..0a3fde4 100644 --- a/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml +++ b/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml @@ -21,7 +21,7 @@ org.apache.camel.k camel-k-runtime-examples -0.3.3-SNAPSHOT +0.3.3 4.0.0 diff --git a/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml b/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml index 2698c00..7d48704 100644 --- a/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml +++ b/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml @@ -21,7 +21,7 @@ org.apache.camel.k camel-k-runtime-examples -0.3.3-SNAPSHOT +0.3.3 4.0.0 diff --git a/camel-k-runtime-examples/pom.xml b/camel-k-runtime-examples/pom.xml index 94e538b..4a1d383 100644 --- a/camel-k-runtime-examples/pom.xml +++ b/camel-k-runtime-examples/pom.xml @@ -21,7 +21,7 @@ org.apache.camel.k
[camel] branch master updated: Removed not used property placeholder for commons-configuration-bundle-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 1ee48a3 Removed not used property placeholder for commons-configuration-bundle-version 1ee48a3 is described below commit 1ee48a341e3a138eff3aa5bd4271db3a50e6db5c Author: Andrea Cosentino AuthorDate: Tue May 28 11:18:15 2019 +0200 Removed not used property placeholder for commons-configuration-bundle-version --- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4c152da..6cc5313 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -134,7 +134,6 @@ 3.2.2 1.18 1.9 - 1.9_1 2.5 1.6 1.4
[camel] branch master updated: Upgrade Commons Configuration to version 2.5
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 4aead20 Upgrade Commons Configuration to version 2.5 4aead20 is described below commit 4aead2088b989e3b122495ca44332dea27c9a438 Author: Andrea Cosentino AuthorDate: Tue May 28 11:13:24 2019 +0200 Upgrade Commons Configuration to version 2.5 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index be15480..4c152da 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -135,7 +135,7 @@ 1.18 1.9 1.9_1 -2.4 +2.5 1.6 1.4 1.0.15
[camel] branch master updated: Fixed CS for Camel-File
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 8a29f58 Fixed CS for Camel-File
8a29f58 is described below
commit 8a29f5812a0276044dfe7ca25b1087a8e1ef89b8
Author: Andrea Cosentino
AuthorDate: Tue May 28 10:31:09 2019 +0200
Fixed CS for Camel-File
---
.../src/main/java/org/apache/camel/component/file/FileEndpoint.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/components/camel-file/src/main/java/org/apache/camel/component/file/FileEndpoint.java
b/components/camel-file/src/main/java/org/apache/camel/component/file/FileEndpoint.java
index a6100f1..831cd7c 100644
---
a/components/camel-file/src/main/java/org/apache/camel/component/file/FileEndpoint.java
+++
b/components/camel-file/src/main/java/org/apache/camel/component/file/FileEndpoint.java
@@ -58,11 +58,11 @@ public class FileEndpoint extends GenericFileEndpoint
{
@UriParam(label = "advanced")
private boolean renameUsingCopy;
@UriParam(label = "consumer,advanced")
-protected boolean startingDirectoryMustExist;
+private boolean startingDirectoryMustExist;
@UriParam(label = "consumer,advanced")
-protected boolean startingDirectoryMustHaveAccess;
+private boolean startingDirectoryMustHaveAccess;
@UriParam(label = "consumer,advanced")
-protected boolean directoryMustExist;
+private boolean directoryMustExist;
@UriParam(label = "consumer,advanced")
private boolean probeContentType;
@UriParam(label = "consumer,advanced")
[camel] branch master updated: Fixed CS for Camel-restlet
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 047cef1 Fixed CS for Camel-restlet 047cef1 is described below commit 047cef10188139f262e392502e8376687667e02a Author: Andrea Cosentino AuthorDate: Tue May 28 10:24:09 2019 +0200 Fixed CS for Camel-restlet --- .../java/org/apache/camel/component/restlet/DefaultRestletBinding.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java index 37c9076..e323b28 100644 --- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java +++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java @@ -38,7 +38,6 @@ import javax.xml.transform.dom.DOMSource; import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.util.xml.StringSource; import org.apache.camel.TypeConverter; import org.apache.camel.WrappedFile; import org.apache.camel.component.file.GenericFile; @@ -49,6 +48,7 @@ import org.apache.camel.support.MessageHelper; import org.apache.camel.support.ObjectHelper; import org.apache.camel.util.StringHelper; import org.apache.camel.util.URISupport; +import org.apache.camel.util.xml.StringSource; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; import org.restlet.Request;
[camel-website] branch asf-site updated: Website updated to 74166d3
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/asf-site by this push: new ae80240 Website updated to 74166d3 ae80240 is described below commit ae80240c54f6082050fb9fbf3b33311f251f790d Author: jenkins AuthorDate: Tue May 28 06:45:33 2019 + Website updated to 74166d3 --- download/index.html| 2 +- index.xml | 2 +- releases/index.html| 6 + releases/index.xml | 1 + releases/release-2.24.0/index.html | 16 + sitemap-camel-k.xml| 42 +-- sitemap-components.xml | 746 ++--- sitemap-manual.xml | 402 ++-- 8 files changed, 620 insertions(+), 597 deletions(-) diff --git a/download/index.html b/download/index.html index 36f5a71..55d92e2 100644 --- a/download/index.html +++ b/download/index.html @@ -3,7 +3,7 @@
[camel-website] branch master updated: [CAMEL-13568] Create archetype for releases
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git
The following commit(s) were added to refs/heads/master by this push:
new 13bb002 [CAMEL-13568] Create archetype for releases
13bb002 is described below
commit 13bb002cd418138ee958ff9748a22319af8a0c01
Author: Francois Papon
AuthorDate: Tue May 28 05:36:40 2019 +0400
[CAMEL-13568] Create archetype for releases
---
archetypes/release-note.md | 12 +++
content/download/_index.md | 9 ++---
content/releases/_index.md | 6
content/releases/release-2.24.0.md | 12 +++
layouts/release-note/single.html | 74 ++
layouts/releases/list.html | 25 +
6 files changed, 134 insertions(+), 4 deletions(-)
diff --git a/archetypes/release-note.md b/archetypes/release-note.md
new file mode 100644
index 000..af67d7b
--- /dev/null
+++ b/archetypes/release-note.md
@@ -0,0 +1,12 @@
+---
+title: "Apache Camel Releases - {{ .Name | title }}"
+url: /releases/{{ .Name }}.html
+date: {{ .Date }}
+draft: true
+type: release-note
+version: ""
+preview: ""
+apiBreaking: ""
+knownIssues: ""
+jiraVersionId: ""
+---
diff --git a/content/download/_index.md b/content/download/_index.md
index 77190aa..976344a 100644
--- a/content/download/_index.md
+++ b/content/download/_index.md
@@ -6,14 +6,15 @@ title: "Download"
Grab these releases while they are hot!
-* The latest release for Camel 2.23.x is [Camel 2.23.1
Release](https://camel.apache.org/camel-2231-release.html).
-* The latest release for Camel 2.22.x is [Camel 2.22.3
Release](https://camel.apache.org/camel-2223-release.html).
-* The latest release for Camel 2.21.x is [Camel 2.21.5
Release](https://camel.apache.org/camel-2215-release.html).
+* The latest release for Camel 2.24.x is [Camel 2.24.0
Release](/releases/release-2.24.0).
+* The latest release for Camel 2.23.x is [Camel 2.23.1
Release](/releases/release-2.23.1).
+* The latest release for Camel 2.22.x is [Camel 2.22.3
Release](/releases/release-2.22.3).
+* The latest release for Camel 2.21.x is [Camel 2.21.5
Release](/releases/release-2.21.5).
* Camel versions 2.20.x and older are no longer actively developed.
## Older Releases
-See [Download Archives](download/archives.html)
+See [Download Archives](/releases)
## Getting the latest distributions
diff --git a/content/releases/_index.md b/content/releases/_index.md
new file mode 100644
index 000..83dadb8
--- /dev/null
+++ b/content/releases/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Apache Camel Releases"
+---
+
+# Apache Camel releases
+
diff --git a/content/releases/release-2.24.0.md
b/content/releases/release-2.24.0.md
new file mode 100644
index 000..5149363
--- /dev/null
+++ b/content/releases/release-2.24.0.md
@@ -0,0 +1,12 @@
+---
+date: 2019-05-12
+draft: false
+type: release-note
+version: 2.24.0
+preview: "Minor update of the 2.24.x branch"
+apiBreaking: ""
+knownIssues: ""
+jiraVersionId: 12344459
+---
+
+This release is a minor update of the 2.24.x branch.
diff --git a/layouts/release-note/single.html b/layouts/release-note/single.html
new file mode 100644
index 000..a4a9eb2
--- /dev/null
+++ b/layouts/release-note/single.html
@@ -0,0 +1,74 @@
+{{ partial "header.html" . }}
+
+
+ Apache Camel {{ .Params.version }} Release
+ New and Noteworthy
+ {{ .Content }}
+ API breaking
+ {{ .Params.apiBreaking }}
+ Known issues
+ {{ .Params.knownIssues }}
+ Getting the Binaries using Maven
+ Binary Distributions
+
+
+
+ Description
+ Download Link
+ PGP Signature file of download
+
+
+
+
+ Windows Distribution
+ http://www.apache.org/dyn/closer.cgi/camel/apache-camel/{{
.Params.version }}/apache-camel-{{ .Params.version }}.zip">apache-camel-{{
.Params.version }}.zip
+ http://www.apache.org/dyn/closer.cgi/camel/apache-camel/{{
.Params.version }}/apache-camel-{{ .Params.version }}.zip.asc">apache-camel-{{
.Params.version }}.zip.asc
+
+
+ Unix/Linux/Cygwin Distribution
+ http://www.apache.org/dyn/closer.cgi/camel/apache-camel/{{
.Params.version }}/apache-camel-{{ .Params.version }}.tar.gz">apache-camel-{{
.Params.version }}.tar.gz
+ http://www.apache.org/dyn/closer.cgi/camel/apache-camel/{{
.Params.version }}/apache-camel-{{ .Params.version
}}.tar.gz.asc">apache-camel-{{ .Params.version }}.tar.gz.asc
+
+
+
+ Source Distributions
+
+
+
+ Description
+ Download Link
+ PGP Signature file of download
+
+
+
+
+ Source (zip)
+ http://www.apache.org/dyn/closer.cgi/camel/apache-camel/{{
.Params.version }}/apache-camel-{{ .Params.version }}-src.zip">apache-camel-{{
.Params.version }}-src.zip
+ http://www.apache.org/dyn/closer.cgi/camel/apache-camel/{{
.Params.version }}/apache-camel-{{
