[camel] 01/04: CAMEL-13483: Fixed CS
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
commit c383b69b56d0f70a2a8358091cd776c20ddb2f7f
Author: Claus Ibsen
AuthorDate: Tue May 28 05:45:17 2019 +0200
CAMEL-13483: Fixed CS
---
.../apache/camel/component/file/FileEndpoint.java | 8 +--
.../camel/component/file/GenericFileEndpoint.java | 16 +++---
...onsumerStartingDirectoryMustHaveAccessTest.java | 59 +++---
3 files changed, 42 insertions(+), 41 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 23e5eda..63af76d 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
@@ -93,11 +93,11 @@ public class FileEndpoint extends GenericFileEndpoint
{
}
}
if (!isStartingDirectoryMustExist() &&
isStartingDirectoryMustHaveAccess()) {
- throw new IllegalArgumentException("You cannot set
startingDirectoryMustHaveAccess=true without setting
startingDirectoryMustExist=true");
+throw new IllegalArgumentException("You cannot set
startingDirectoryMustHaveAccess=true without setting
startingDirectoryMustExist=true");
} else if (isStartingDirectoryMustExist() &&
isStartingDirectoryMustHaveAccess()) {
- if (!file.canRead() || !file.canWrite()) {
-throw new IOException("Starting directory permission denied: " +
file);
- }
+if (!file.canRead() || !file.canWrite()) {
+throw new IOException("Starting directory permission denied: "
+ file);
+}
}
FileConsumer result = newFileConsumer(processor, operations);
diff --git
a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
index 7f19cfd..62c39bd 100644
---
a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
+++
b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
@@ -1125,17 +1125,17 @@ public abstract class GenericFileEndpoint extends
ScheduledPollEndpoint imple
}
public boolean isStartingDirectoryMustHaveAccess() {
- return startingDirectoryMustHaveAccess;
+return startingDirectoryMustHaveAccess;
}
- /**
- * 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.
- */
+/**
+ * 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.
+ */
public void setStartingDirectoryMustHaveAccess(boolean
startingDirectoryMustHaveAccess) {
- this.startingDirectoryMustHaveAccess = startingDirectoryMustHaveAccess;
+this.startingDirectoryMustHaveAccess = startingDirectoryMustHaveAccess;
}
public boolean isDirectoryMustExist() {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerStartingDirectoryMustHaveAccessTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerStartingDirectoryMustHaveAccessTest.java
index 3e66a6f..92c04b0 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerStartingDirectoryMustHaveAccessTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerStartingDirectoryMustHaveAccessTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.file;
import java.io.File;
import java.io.IOException;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
@@ -26,39 +27,39 @@ import org.junit.Test;
public class FileConsumerStartingDirectoryMustHaveAccessTest extends
ContextTestSupport {
- @Override
- public void setUp() throws Exception {
-File file1 = new File("./target/noAccess");
-if (file1.exists()) {
- file1.setReadable(true);
+@Override
+public void setUp() throws Exception {
+File file1 = new File("./target/noAccess");
+if (file1.exists()) {
+file1.setReadable(true);
+}
+deleteDirectory("target/noAccess");
+file1.mkdirs();
+file1.setReadable(false);
+super.setUp();
}
-
[camel] 03/04: Move some options that was only used by file component out of general so they dont get inherited in ftp component.
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
commit dd6f67ae2cc44eafca1b8ab6901715114421d0f5
Author: Claus Ibsen
AuthorDate: Tue May 28 06:05:24 2019 +0200
Move some options that was only used by file component out of general so
they dont get inherited in ftp component.
---
.../apache/camel/component/file/FileEndpoint.java | 48 +-
.../camel/component/file/GenericFileEndpoint.java | 44
.../camel-ftp/src/main/docs/ftp-component.adoc | 4 +-
.../camel-ftp/src/main/docs/ftps-component.adoc| 4 +-
.../camel-ftp/src/main/docs/sftp-component.adoc| 4 +-
5 files changed, 49 insertions(+), 55 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 63af76d..a6100f1 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
@@ -57,12 +57,18 @@ public class FileEndpoint extends GenericFileEndpoint
{
private boolean copyAndDeleteOnRenameFail = true;
@UriParam(label = "advanced")
private boolean renameUsingCopy;
-@UriParam(label = "producer,advanced", defaultValue = "true")
-private boolean forceWrites = true;
+@UriParam(label = "consumer,advanced")
+protected boolean startingDirectoryMustExist;
+@UriParam(label = "consumer,advanced")
+protected boolean startingDirectoryMustHaveAccess;
+@UriParam(label = "consumer,advanced")
+protected boolean directoryMustExist;
@UriParam(label = "consumer,advanced")
private boolean probeContentType;
@UriParam(label = "consumer,advanced")
private String extendedAttributes;
+@UriParam(label = "producer,advanced", defaultValue = "true")
+private boolean forceWrites = true;
@UriParam(label = "producer,advanced")
private String chmod;
@UriParam(label = "producer,advanced")
@@ -258,6 +264,44 @@ public class FileEndpoint extends
GenericFileEndpoint {
this.renameUsingCopy = renameUsingCopy;
}
+public boolean isStartingDirectoryMustExist() {
+return startingDirectoryMustExist;
+}
+
+/**
+ * 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.
+ */
+public void setStartingDirectoryMustExist(boolean
startingDirectoryMustExist) {
+this.startingDirectoryMustExist = startingDirectoryMustExist;
+}
+
+public boolean isStartingDirectoryMustHaveAccess() {
+return startingDirectoryMustHaveAccess;
+}
+
+/**
+ * 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.
+ */
+public void setStartingDirectoryMustHaveAccess(boolean
startingDirectoryMustHaveAccess) {
+this.startingDirectoryMustHaveAccess = startingDirectoryMustHaveAccess;
+}
+
+public boolean isDirectoryMustExist() {
+return directoryMustExist;
+}
+
+/**
+ * Similar to the startingDirectoryMustExist option but this applies
during polling (after starting the consumer).
+ */
+public void setDirectoryMustExist(boolean directoryMustExist) {
+this.directoryMustExist = directoryMustExist;
+}
+
public boolean isForceWrites() {
return forceWrites;
}
diff --git
a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
index 62c39bd..ed2b8c9 100644
---
a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
+++
b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
@@ -108,12 +108,6 @@ public abstract class GenericFileEndpoint extends
ScheduledPollEndpoint imple
protected IdempotentRepository inProgressRepository =
MemoryIdempotentRepository.memoryIdempotentRepository(DEFAULT_IN_PROGRESS_CACHE_SIZE);
@UriParam(label = "consumer,advanced")
protected String localWorkDirectory;
-@UriParam(label = "consumer,advanced")
-protected boolean startingDirectoryMustExist;
-@UriParam(label = "consumer,advanced")
-protected boolean startingDirectoryMustHaveAccess;
-@UriParam(label =
[camel] branch master updated (2f744d6 -> 9008caa)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 2f744d6 CAMEL-13483 File Component: Add option to fail startup when not having read permission on folder new c383b69 CAMEL-13483: Fixed CS new df1f34f Fixed CS new dd6f67a Move some options that was only used by file component out of general so they dont get inherited in ftp component. new 9008caa Fixed CS The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../component/cxf/converter/CachedCxfPayload.java | 2 +- .../apache/camel/component/file/FileEndpoint.java | 56 +--- .../camel/component/file/GenericFileEndpoint.java | 44 .../camel-ftp/src/main/docs/ftp-component.adoc | 4 +- .../camel-ftp/src/main/docs/ftps-component.adoc| 4 +- .../camel-ftp/src/main/docs/sftp-component.adoc| 4 +- .../camel/component/jms/JmsXMLRouteTest.java | 2 +- .../camel/component/xquery/XQueryBuilder.java | 4 +- .../camel/converter/saxon/SaxonConverterTest.java | 2 +- .../spring/ws/ProducerLocalRouteTest.java | 2 +- .../processor/XmlSignatureProcessor.java | 3 +- ...onsumerStartingDirectoryMustHaveAccessTest.java | 59 +++--- .../apache/camel/converter/StringSourceTest.java | 2 +- .../camel/converter/jaxp/BytesSourceTest.java | 2 +- .../camel/converter/jaxp/XmlConverterTest.java | 5 +- .../apache/camel/impl/LogDebugBodyStreamsTest.java | 2 +- .../MultiCastParallelAndStreamCachingTest.java | 3 +- .../StreamSourceContentBasedRouterTest.java| 4 +- .../ValidatingProcessorFromSourceTest.java | 3 +- .../camel/processor/ValidatingProcessorTest.java | 3 +- .../apache/camel/converter/jaxp/XmlConverter.java | 4 +- 21 files changed, 105 insertions(+), 109 deletions(-)
[camel] 04/04: Fixed CS
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 commit 9008caab173f51dbcfdbf3a10c1a4953d48180ef Author: Claus Ibsen AuthorDate: Tue May 28 06:10:15 2019 +0200 Fixed CS --- .../org/apache/camel/component/cxf/converter/CachedCxfPayload.java| 2 +- .../src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java | 2 +- .../main/java/org/apache/camel/component/xquery/XQueryBuilder.java| 4 ++-- .../java/org/apache/camel/converter/saxon/SaxonConverterTest.java | 2 +- .../org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java | 2 +- .../camel/component/xmlsecurity/processor/XmlSignatureProcessor.java | 3 ++- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java index 27cec31..5335d75 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java @@ -38,10 +38,10 @@ import org.apache.camel.Exchange; import org.apache.camel.StreamCache; import org.apache.camel.component.cxf.CxfPayload; import org.apache.camel.converter.stream.CachedOutputStream; -import org.apache.camel.util.xml.StreamSourceCache; import org.apache.camel.support.builder.xml.StAX2SAXSource; import org.apache.camel.support.builder.xml.XMLConverterHelper; import org.apache.camel.util.ObjectHelper; +import org.apache.camel.util.xml.StreamSourceCache; import org.apache.cxf.staxutils.StaxSource; import org.apache.cxf.staxutils.StaxUtils; import org.slf4j.Logger; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java index 71eed49..b4a91f8 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java @@ -25,10 +25,10 @@ import javax.xml.transform.stream.StreamSource; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.util.xml.StringSource; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.util.xml.StringSource; import org.junit.Test; import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge; diff --git a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java index 6bbdb39..5cf7fc4 100644 --- a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java +++ b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java @@ -61,7 +61,6 @@ import net.sf.saxon.value.Int64Value; import net.sf.saxon.value.IntegerValue; import net.sf.saxon.value.ObjectValue; import net.sf.saxon.value.StringValue; -import org.apache.camel.util.xml.BytesSource; import org.apache.camel.Exchange; import org.apache.camel.Expression; import org.apache.camel.Message; @@ -69,11 +68,12 @@ import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.RuntimeExpressionException; -import org.apache.camel.util.xml.StringSource; import org.apache.camel.spi.NamespaceAware; import org.apache.camel.support.MessageHelper; import org.apache.camel.util.IOHelper; import org.apache.camel.util.ObjectHelper; +import org.apache.camel.util.xml.BytesSource; +import org.apache.camel.util.xml.StringSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/converter/saxon/SaxonConverterTest.java b/components/camel-saxon/src/test/java/org/apache/camel/converter/saxon/SaxonConverterTest.java index d903112..4749df1 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/converter/saxon/SaxonConverterTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/converter/saxon/SaxonConverterTest.java @@ -33,10 +33,10 @@ import net.sf.saxon.om.NodeInfo; import net.sf.saxon.trans.XPathException; import net.sf.saxon.xpath.XPathEvaluator; import org.apache.camel.Exchange; -import org.apache.camel.util.xml.StringSource; import org.apache.camel.language.xpath.DefaultNamespaceContext; import org.apache.camel.support.DefaultExchange; import org.apache.camel.test.junit4.CamelTestSupport;
[camel] 02/04: Fixed CS
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
commit df1f34f7f47387b73ea43a70093543d7ed29faca
Author: Claus Ibsen
AuthorDate: Tue May 28 05:48:42 2019 +0200
Fixed CS
---
.../src/test/java/org/apache/camel/converter/StringSourceTest.java | 2 +-
.../test/java/org/apache/camel/converter/jaxp/BytesSourceTest.java | 2 +-
.../test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java | 5 ++---
.../src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java | 2 +-
.../camel/processor/MultiCastParallelAndStreamCachingTest.java | 3 +--
.../apache/camel/processor/StreamSourceContentBasedRouterTest.java | 4 ++--
.../apache/camel/processor/ValidatingProcessorFromSourceTest.java| 3 ++-
.../java/org/apache/camel/processor/ValidatingProcessorTest.java | 3 ++-
.../src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java | 4 ++--
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java
b/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java
index e78c464..0d0378e 100644
---
a/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java
@@ -21,7 +21,6 @@ import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import org.apache.camel.util.xml.StringSource;
import org.apache.camel.TypeConverter;
import org.apache.camel.impl.converter.DefaultTypeConverter;
import org.apache.camel.impl.engine.DefaultClassResolver;
@@ -29,6 +28,7 @@ import
org.apache.camel.impl.engine.DefaultFactoryFinderResolver;
import org.apache.camel.impl.engine.DefaultPackageScanClassResolver;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ReflectionInjector;
+import org.apache.camel.util.xml.StringSource;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/BytesSourceTest.java
b/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/BytesSourceTest.java
index f7003e6..6990474 100644
---
a/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/BytesSourceTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/BytesSourceTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.converter.jaxp;
-import org.apache.camel.util.xml.BytesSource;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.util.xml.BytesSource;
import org.junit.Test;
public class BytesSourceTest extends ContextTestSupport {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java
b/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java
index 2ef19c3..1f33e39 100644
---
a/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
package org.apache.camel.converter.jaxp;
+
import java.io.File;
import java.io.InputStream;
import java.io.Reader;
import java.nio.ByteBuffer;
import java.util.Properties;
-
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
@@ -32,15 +32,14 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
import org.xml.sax.InputSource;
-import org.apache.camel.util.xml.BytesSource;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.DefaultExchange;
+import org.apache.camel.util.xml.BytesSource;
import org.junit.Before;
import org.junit.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java
index 7c52965..39ec63b 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java
@@ -21,9 +21,9 @@ import java.io.InputStream;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
-import org.apache.camel.util.xml.StringSource;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.xml.StringSource;
import org.junit.Test;
public class LogDebugBodyStreamsTest extends ContextTestSupport {
diff --git
[camel] branch master updated: CAMEL-13483 File Component: Add option to fail startup when not having read permission on folder
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 2f744d6 CAMEL-13483 File Component: Add option to fail startup when not having read permission on folder 2f744d6 is described below commit 2f744d6c78672c386f7248b2ac547ed421cc9759 Author: Roberto Flores AuthorDate: Fri May 24 14:23:41 2019 -0500 CAMEL-13483 File Component: Add option to fail startup when not having read permission on folder -add option startingDirectoryMustHaveAccess -add a new test --- .../camel-file/src/main/docs/file-component.adoc | 3 +- .../apache/camel/component/file/FileEndpoint.java | 9 ++- .../camel/component/file/GenericFileEndpoint.java | 16 ++ ...onsumerStartingDirectoryMustHaveAccessTest.java | 64 ++ 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/components/camel-file/src/main/docs/file-component.adoc b/components/camel-file/src/main/docs/file-component.adoc index e822f50..54d4b1b 100644 --- a/components/camel-file/src/main/docs/file-component.adoc +++ b/components/camel-file/src/main/docs/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/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 f23fc2b..23e5eda 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 @@ -18,6 +18,7 @@ package org.apache.camel.component.file; import java.io.File; import java.io.FileNotFoundException; +import java.io.IOException; import java.nio.file.Files; import java.nio.file.attribute.PosixFilePermission; import java.util.Arrays; @@ -91,7 +92,13 @@ public class
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/34172 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/34171 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-website] branch asf-site updated: Website updated to 90797cd
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 74166d3 Website updated to 90797cd
74166d3 is described below
commit 74166d3a6adcaacab9e697a77268effb28ebb759
Author: jenkins
AuthorDate: Mon May 27 18:00:41 2019 +
Website updated to 90797cd
---
_/js/vendor/highlight.js | 2 +-
sitemap-camel-k.xml | 42 +--
sitemap-components.xml | 746 +++
sitemap-manual.xml | 402 -
4 files changed, 596 insertions(+), 596 deletions(-)
diff --git a/_/js/vendor/highlight.js b/_/js/vendor/highlight.js
index 91b9b9c..6295fbf 100644
--- a/_/js/vendor/highlight.js
+++ b/_/js/vendor/highlight.js
@@ -1 +1 @@
-!function s(r,l,o){function c(n,e){if(!l[n]){if(!r[n]){var
a="function"==typeof require&if(!e&)return a(n,!0);if(d)return
d(n,!0);var i=new Error("Cannot find module '"+n+"'");throw
i.code="MODULE_NOT_FOUND",i}var
t=l[n]={exports:{}};r[n][0].call(t.exports,function(e){return
c(r[n][1][e]||e)},t,t.exports,s,r,l,o)}return l[n].exports}for(var
d="function"==typeof require&,e=0;ehttp://www.sitemaps.org/schemas/sitemap/0.9;>
https://camel.apache.org/staging/camel-k/latest/configuration/components.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/configuration/configmap-secret.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/configuration/configuration.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/configuration/dependencies.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/configuration/logging.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/index.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/installation/gke.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/installation/installation.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/installation/minikube.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/installation/minishift.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/installation/openshift.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/languages/groovy.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/languages/java.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/languages/javascript.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/languages/kotlin.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/languages/languages.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/languages/xml.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/running/dev-mode.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/running/running.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/traits.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/camel-k/latest/uninstalling.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
\ No newline at end of file
diff --git a/sitemap-components.xml b/sitemap-components.xml
index bee5fc7..137de49 100644
--- a/sitemap-components.xml
+++ b/sitemap-components.xml
@@ -2,1494 +2,1494 @@
http://www.sitemaps.org/schemas/sitemap/0.9;>
https://camel.apache.org/staging/components/latest/activemq-component.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/components/latest/ahc-component.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/components/latest/ahc-ws-component.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/components/latest/amqp-component.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
https://camel.apache.org/staging/components/latest/apns-component.html
-2019-05-27T15:06:49.216Z
+2019-05-27T17:59:49.509Z
[camel-website] branch master updated: yarn upgrade inside antora
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 4b1a69d yarn upgrade inside antora 4b1a69d is described below commit 4b1a69d78a673f7ca124a4a67601fe4813a8bc61 Author: nayanangamuhandiram AuthorDate: Mon May 27 20:58:31 2019 +0530 yarn upgrade inside antora --- antora-ui-camel/yarn.lock | 668 -- 1 file changed, 349 insertions(+), 319 deletions(-) diff --git a/antora-ui-camel/yarn.lock b/antora-ui-camel/yarn.lock index 00bb44a..4011b4e 100644 --- a/antora-ui-camel/yarn.lock +++ b/antora-ui-camel/yarn.lock @@ -10,17 +10,17 @@ "@babel/highlight" "^7.0.0" "@babel/core@^7.1.2": - version "7.4.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.3.tgz#198d6d3af4567be3989550d97e068de94503074f; - integrity sha512-oDpASqKFlbspQfzAE7yaeTmdljSH2ADIvBlb0RwbStltTuWa0+7CCI1fYVINNv9saHPa1W7oaKeuNuKj+RQCvA== + version "7.4.5" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.5.tgz#081f97e8ffca65a9b4b0fdc7e274e703f000c06a; + integrity sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA== dependencies: "@babel/code-frame" "^7.0.0" -"@babel/generator" "^7.4.0" -"@babel/helpers" "^7.4.3" -"@babel/parser" "^7.4.3" -"@babel/template" "^7.4.0" -"@babel/traverse" "^7.4.3" -"@babel/types" "^7.4.0" +"@babel/generator" "^7.4.4" +"@babel/helpers" "^7.4.4" +"@babel/parser" "^7.4.5" +"@babel/template" "^7.4.4" +"@babel/traverse" "^7.4.5" +"@babel/types" "^7.4.4" convert-source-map "^1.1.0" debug "^4.1.0" json5 "^2.1.0" @@ -29,12 +29,12 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.4.0": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.0.tgz#c230e79589ae7a729fd4631b9ded4dc220418196; - integrity sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ== +"@babel/generator@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.4.tgz#174a215eb843fc392c7edcaabeaa873de6e8f041; + integrity sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ== dependencies: -"@babel/types" "^7.4.0" +"@babel/types" "^7.4.4" jsesc "^2.5.1" lodash "^4.17.11" source-map "^0.5.0" @@ -56,21 +56,21 @@ dependencies: "@babel/types" "^7.0.0" -"@babel/helper-split-export-declaration@^7.4.0": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz#571bfd52701f492920d63b7f735030e9a3e10b55; - integrity sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw== +"@babel/helper-split-export-declaration@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677; + integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q== dependencies: -"@babel/types" "^7.4.0" +"@babel/types" "^7.4.4" -"@babel/helpers@^7.4.3": - version "7.4.3" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.3.tgz#7b1d354363494b31cb9a2417ae86af32b7853a3b; - integrity sha512-BMh7X0oZqb36CfyhvtbSmcWc3GXocfxv3yNsAEuM0l+fAqSO22rQrUpijr3oE/10jCTrB6/0b9kzmG4VetCj8Q== +"@babel/helpers@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.4.tgz#868b0ef59c1dd4e78744562d5ce1b59c89f2f2a5; + integrity sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A== dependencies: -"@babel/template" "^7.4.0" -"@babel/traverse" "^7.4.3" -"@babel/types" "^7.4.0" +"@babel/template" "^7.4.4" +"@babel/traverse" "^7.4.4" +"@babel/types" "^7.4.4" "@babel/highlight@^7.0.0": version "7.0.0" @@ -81,39 +81,39 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.4.0", "@babel/parser@^7.4.3": - version "7.4.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.3.tgz#eb3ac80f64aa101c907d4ce5406360fe75b7895b; - integrity sha512-gxpEUhTS1sGA63EGQGuA+WESPR/6tz6ng7tSHFCmaTJK/cGK8y37cBTspX+U2xCAue2IQVvF6Z0oigmjwD8YGQ== +"@babel/parser@^7.4.4", "@babel/parser@^7.4.5": + version "7.4.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.5.tgz#04af8d5d5a2b044a2a1bffacc1e5e6673544e872; + integrity sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew== -"@babel/template@^7.1.0", "@babel/template@^7.4.0": - version "7.4.0" - resolved
[camel] branch camel-2.22.x updated: [CAMEL-13376]camel-cxf - failure processor for custom exception handling cannot get the original message
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 a9f3c7f [CAMEL-13376]camel-cxf - failure processor for custom
exception handling cannot get the original message
a9f3c7f is described below
commit a9f3c7ffea14d338b333e1138505040f5a45c1f1
Author: Freeman Fang
AuthorDate: Mon May 27 13:49:49 2019 -0400
[CAMEL-13376]camel-cxf - failure processor for custom exception handling
cannot get the original message
(cherry picked from commit b2092741930ce76ea2561a8bb076272ca4d97898)
(cherry picked from commit 8f9f6e8ebbda3e4b6bfc9d1ca2a290b94678dd8e)
(cherry picked from commit a7b1103915404579a1dfe906b2eb876bd86d2816)
---
.../apache/camel/component/cxf/converter/CachedCxfPayload.java | 9 +
1 file changed, 9 insertions(+)
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
index d82fcac..427cb99 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.cxf.converter;
import java.io.IOException;
import java.io.OutputStream;
+import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.ListIterator;
import java.util.Map;
@@ -92,6 +93,14 @@ public class CachedCxfPayload extends CxfPayload
implements StreamCache {
li.set(document);
}
}
+try {
+Field bodyField =
getClass().getSuperclass().getDeclaredField("body");
+bodyField.setAccessible(true);
+bodyField.set(orig, getBodySources());
+
+} catch (NoSuchFieldException | IllegalAccessException e) {
+LOG.debug("can't use reflection way to set body in CxfPayload", e);
+}
}
private CachedCxfPayload(CachedCxfPayload orig, Exchange exchange)
throws IOException {
[camel] branch camel-2.23.x updated: [CAMEL-13376]camel-cxf - failure processor for custom exception handling cannot get the original message
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 a7b1103 [CAMEL-13376]camel-cxf - failure processor for custom
exception handling cannot get the original message
a7b1103 is described below
commit a7b1103915404579a1dfe906b2eb876bd86d2816
Author: Freeman Fang
AuthorDate: Mon May 27 13:49:49 2019 -0400
[CAMEL-13376]camel-cxf - failure processor for custom exception handling
cannot get the original message
(cherry picked from commit b2092741930ce76ea2561a8bb076272ca4d97898)
(cherry picked from commit 8f9f6e8ebbda3e4b6bfc9d1ca2a290b94678dd8e)
---
.../apache/camel/component/cxf/converter/CachedCxfPayload.java | 9 +
1 file changed, 9 insertions(+)
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
index d82fcac..427cb99 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.cxf.converter;
import java.io.IOException;
import java.io.OutputStream;
+import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.ListIterator;
import java.util.Map;
@@ -92,6 +93,14 @@ public class CachedCxfPayload extends CxfPayload
implements StreamCache {
li.set(document);
}
}
+try {
+Field bodyField =
getClass().getSuperclass().getDeclaredField("body");
+bodyField.setAccessible(true);
+bodyField.set(orig, getBodySources());
+
+} catch (NoSuchFieldException | IllegalAccessException e) {
+LOG.debug("can't use reflection way to set body in CxfPayload", e);
+}
}
private CachedCxfPayload(CachedCxfPayload orig, Exchange exchange)
throws IOException {
[camel] branch camel-2.24.x updated: [CAMEL-13376]camel-cxf - failure processor for custom exception handling cannot get the original message
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 8f9f6e8 [CAMEL-13376]camel-cxf - failure processor for custom
exception handling cannot get the original message
8f9f6e8 is described below
commit 8f9f6e8ebbda3e4b6bfc9d1ca2a290b94678dd8e
Author: Freeman Fang
AuthorDate: Mon May 27 13:49:49 2019 -0400
[CAMEL-13376]camel-cxf - failure processor for custom exception handling
cannot get the original message
(cherry picked from commit b2092741930ce76ea2561a8bb076272ca4d97898)
---
.../apache/camel/component/cxf/converter/CachedCxfPayload.java | 9 +
1 file changed, 9 insertions(+)
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
index d82fcac..427cb99 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.cxf.converter;
import java.io.IOException;
import java.io.OutputStream;
+import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.ListIterator;
import java.util.Map;
@@ -92,6 +93,14 @@ public class CachedCxfPayload extends CxfPayload
implements StreamCache {
li.set(document);
}
}
+try {
+Field bodyField =
getClass().getSuperclass().getDeclaredField("body");
+bodyField.setAccessible(true);
+bodyField.set(orig, getBodySources());
+
+} catch (NoSuchFieldException | IllegalAccessException e) {
+LOG.debug("can't use reflection way to set body in CxfPayload", e);
+}
}
private CachedCxfPayload(CachedCxfPayload orig, Exchange exchange)
throws IOException {
[camel] branch camel-2.x updated: [CAMEL-13376]camel-cxf - failure processor for custom exception handling cannot get the original message
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 b209274 [CAMEL-13376]camel-cxf - failure processor for custom
exception handling cannot get the original message
b209274 is described below
commit b2092741930ce76ea2561a8bb076272ca4d97898
Author: Freeman Fang
AuthorDate: Mon May 27 13:49:49 2019 -0400
[CAMEL-13376]camel-cxf - failure processor for custom exception handling
cannot get the original message
---
.../apache/camel/component/cxf/converter/CachedCxfPayload.java | 9 +
1 file changed, 9 insertions(+)
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
index d82fcac..427cb99 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.cxf.converter;
import java.io.IOException;
import java.io.OutputStream;
+import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.ListIterator;
import java.util.Map;
@@ -92,6 +93,14 @@ public class CachedCxfPayload extends CxfPayload
implements StreamCache {
li.set(document);
}
}
+try {
+Field bodyField =
getClass().getSuperclass().getDeclaredField("body");
+bodyField.setAccessible(true);
+bodyField.set(orig, getBodySources());
+
+} catch (NoSuchFieldException | IllegalAccessException e) {
+LOG.debug("can't use reflection way to set body in CxfPayload", e);
+}
}
private CachedCxfPayload(CachedCxfPayload orig, Exchange exchange)
throws IOException {
[camel] branch master updated: [CAMEL-13376]camel-cxf - failure processor for custom exception handling cannot get the original message
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 5b0e473 [CAMEL-13376]camel-cxf - failure processor for custom
exception handling cannot get the original message
5b0e473 is described below
commit 5b0e473cfd1afca0d2d700c88e75f9bcd3d3a621
Author: Freeman Fang
AuthorDate: Mon May 27 13:27:39 2019 -0400
[CAMEL-13376]camel-cxf - failure processor for custom exception handling
cannot get the original message
---
.../src/main/java/org/apache/camel/component/cxf/CxfPayload.java | 8
.../apache/camel/component/cxf/converter/CachedCxfPayload.java| 1 +
2 files changed, 9 insertions(+)
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
index d241a26..8931de1 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
@@ -134,6 +134,14 @@ public class CxfPayload {
return body;
}
+/*
+ * set the body back with cached stream source so
+ * CxfPayload is re-readable
+ */
+public void setBodySources(List body) {
+this.body = body;
+}
+
public List getHeaders() {
return headers;
}
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
index 7764cd7..27cec31 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
@@ -100,6 +100,7 @@ public class CachedCxfPayload extends CxfPayload
implements StreamCache {
li.set(document);
}
}
+orig.setBodySources(getBodySources());
}
private CachedCxfPayload(CachedCxfPayload orig, Exchange exchange)
throws IOException {
[camel] branch master updated: CAMEL-13581: Avoid duplicate TypeConverter WARNs from when using OSGi.
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 0192930 CAMEL-13581: Avoid duplicate TypeConverter WARNs from when
using OSGi.
0192930 is described below
commit 01929305fda4dd9b9017fd984b00319f368d50ed
Author: Claus Ibsen
AuthorDate: Mon May 27 18:10:05 2019 +0200
CAMEL-13581: Avoid duplicate TypeConverter WARNs from when using OSGi.
---
.../apache/camel/core/osgi/OsgiTypeConverter.java | 27 +-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git
a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
index f328be8..0c31bc0 100644
---
a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
+++
b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
@@ -43,8 +43,10 @@ import org.apache.camel.impl.converter.DefaultTypeConverter;
import org.apache.camel.impl.engine.DefaultPackageScanClassResolver;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.Injector;
+import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.spi.TypeConverterLoader;
import org.apache.camel.spi.TypeConverterRegistry;
+import org.apache.camel.support.SimpleTypeConverter;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.support.service.ServiceSupport;
import org.osgi.framework.BundleContext;
@@ -218,7 +220,7 @@ public class OsgiTypeConverter extends ServiceSupport
implements TypeConverter,
protected DefaultTypeConverter createRegistry() {
// base the osgi type converter on the default type converter
-DefaultTypeConverter answer = new DefaultTypeConverter(new
DefaultPackageScanClassResolver() {
+DefaultTypeConverter answer = new OsgiDefaultTypeConverter(new
DefaultPackageScanClassResolver() {
@Override
public Set getClassLoaders() {
// we only need classloaders for loading core
TypeConverterLoaders
@@ -280,4 +282,27 @@ public class OsgiTypeConverter extends ServiceSupport
implements TypeConverter,
Spliterator.ORDERED), false);
}
+private class OsgiDefaultTypeConverter extends DefaultTypeConverter {
+
+public OsgiDefaultTypeConverter(PackageScanClassResolver resolver,
Injector injector, FactoryFinder factoryFinder, boolean loadTypeConverters) {
+super(resolver, injector, factoryFinder, loadTypeConverters);
+}
+
+@Override
+public void addTypeConverter(Class toType, Class fromType,
TypeConverter typeConverter) {
+// favour keeping the converter that was loaded via
TypeConverterLoader META-INF file
+// as OSGi loads these first and then gets triggered again later
when there is both a META-INF/TypeConverter and META-INF/TypeConverterLoaded
file
+// for the same set of type converters and we get duplicates (so
this is a way of filtering out duplicates)
+TypeConverter converter = typeMappings.get(toType, fromType);
+if (converter != null && converter != typeConverter) {
+// the converter is already there which we want to keep
(optimized via SimpleTypeConverter)
+if (converter instanceof SimpleTypeConverter) {
+// okay keep this one
+return;
+}
+}
+super.addTypeConverter(toType, fromType, typeConverter);
+}
+}
+
}
[camel] 01/02: camel3 - Fixed so fallback type converter is from url3
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 commit 6ee23cf9e0aa553bf293af91f592c9fac499f7b3 Author: Claus Ibsen AuthorDate: Mon May 27 16:59:44 2019 +0200 camel3 - Fixed so fallback type converter is from url3 --- .../src/main/java/org/apache/camel/core/osgi/impl/Activator.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java index dd105b0..ac1e0f5 100644 --- a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java +++ b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java @@ -235,7 +235,7 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer
[camel] branch master updated (098df3f -> e484a66)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 098df3f Removing unused jdom dependency new 6ee23cf camel3 - Fixed so fallback type converter is from url3 new e484a66 CAMEL-13581: Avoid generating TypeConverter files for core JARs as they are loaded via TypeConverterLoaded files instead. 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/java/org/apache/camel/core/osgi/impl/Activator.java| 2 +- .../java/org/apache/camel/tools/apt/TypeConverterProcessor.java | 6 +- 2 files changed, 6 insertions(+), 2 deletions(-)
[camel] 02/02: CAMEL-13581: Avoid generating TypeConverter files for core JARs as they are loaded via TypeConverterLoaded files instead.
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
commit e484a66003b58bd08873e6483f8b415d85097f50
Author: Claus Ibsen
AuthorDate: Mon May 27 17:36:07 2019 +0200
CAMEL-13581: Avoid generating TypeConverter files for core JARs as they are
loaded via TypeConverterLoaded files instead.
---
.../java/org/apache/camel/tools/apt/TypeConverterProcessor.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/TypeConverterProcessor.java
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/TypeConverterProcessor.java
index c53b7e0..909551c 100644
---
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/TypeConverterProcessor.java
+++
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/TypeConverterProcessor.java
@@ -51,9 +51,13 @@ public class TypeConverterProcessor extends
AbstractCamelAnnotationProcessor {
}
}
}
+// skip all converter classes from core as we just want to use the
optimized TypeConverterLoader files
if (!converterClasses.isEmpty()
&&
!converterClasses.containsKey("org.apache.camel.converter.IOConverter")
-&&
!converterClasses.containsKey("org.apache.camel.converter.jaxp.DomConverter")) {
+&&
!converterClasses.containsKey("org.apache.camel.converter.jaxp.DomConverter")
+&&
!converterClasses.containsKey("org.apache.camel.converter.jaxp.XmlConverter")
+&&
!converterClasses.containsKey("org.apache.camel.util.xml.StreamSourceConverter")
+&&
!converterClasses.containsKey("org.apache.camel.converter.stream.StreamCacheConverter"))
{
Filer filer = processingEnv.getFiler();
FileObject resource =
filer.createResource(StandardLocation.CLASS_OUTPUT,
"", "META-INF/services/org/apache/camel/TypeConverter",
[camel-website] branch asf-site updated: Website updated to e12b026
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 90797cd Website updated to e12b026
90797cd is described below
commit 90797cdcfab42813c3f24458eef17e8aa8098aa5
Author: jenkins
AuthorDate: Mon May 27 15:07:41 2019 +
Website updated to e12b026
---
components/latest/aws-sqs-component.html | 2 +-
index.html | 2 +-
sitemap-camel-k.xml | 42 +-
sitemap-components.xml | 746 +++
sitemap-manual.xml | 402 -
5 files changed, 597 insertions(+), 597 deletions(-)
diff --git a/components/latest/aws-sqs-component.html
b/components/latest/aws-sqs-component.html
index 4e2244b..fe2332a 100644
--- a/components/latest/aws-sqs-component.html
+++ b/components/latest/aws-sqs-component.html
@@ -13,7 +13,7 @@ AmazonSQS client = new AmazonSQSClient(awsCredentials,
clientConfiguration);
registry.bind("client", client);and refer to it in your Camel aws-sqs component
configuration:from("aws-sqs://MyQueue?amazonSQSClient=#clientdelay=5000maxMessagesPerPoll=5")
.to("mock:result");Creating or updating an SQS
QueueIn the SQS Component, when an endpoint is
started, a check is executed to obtain information about the existence of the
queue or not. Youre able to customize the creation through the
QueueAttributeName mapping with the SQSConfiguration option. [...]
-.to("mock:result");In this
example if the MyQueue queue is not already created on AWS, it will be created
with default parameters from the SQS configuration. If its already up on
AWS, the SQS configuration options will be used to override the existent AWS
configuration.DelayQueue [...]
+.to("mock:result");In this
example if the MyQueue queue is not already created on AWS (and the
autoCreateQueue option is set to true), it will be created with default
parameters from the SQS configuration. If its already up on AWS, the SQS
configuration options will be used to override the existent AWS
configuration.
[camel-website] 01/01: Merge pull request #41 from apache/phrasing
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-website.git commit 086ff91ffde962f862b5dbd4d3cd2f8aeb41f32e Merge: ec904b3 7f4c804 Author: Andrea Cosentino AuthorDate: Mon May 27 16:57:41 2019 +0200 Merge pull request #41 from apache/phrasing More phrasing layouts/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[camel-website] branch phrasing deleted (was 7f4c804)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch phrasing in repository https://gitbox.apache.org/repos/asf/camel-website.git. was 7f4c804 More phrasing The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-website] branch master updated (ec904b3 -> 086ff91)
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-website.git. from ec904b3 Merge pull request #40 from apache/index-phrasinfg add 7f4c804 More phrasing new 086ff91 Merge pull request #41 from apache/phrasing The 1 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: layouts/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[camel] branch camel-2.x updated: Removing unused jdom dependency
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 90dae9f Removing unused jdom dependency
90dae9f is described below
commit 90dae9fa3eb68ab781ebe4d2185089698911342a
Author: Colm O hEigeartaigh
AuthorDate: Mon May 27 15:34:40 2019 +0100
Removing unused jdom dependency
---
components/camel-gora/pom.xml | 5 -
1 file changed, 5 deletions(-)
diff --git a/components/camel-gora/pom.xml b/components/camel-gora/pom.xml
index 0cf74f3..f47083a 100644
--- a/components/camel-gora/pom.xml
+++ b/components/camel-gora/pom.xml
@@ -141,11 +141,6 @@
${jackson-version}
- org.apache.servicemix.bundles
- org.apache.servicemix.bundles.jdom
- ${jdom-bundle-version}
-
-
com.google.guava
guava
[camel] branch master updated: Removing unused jdom dependency
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 098df3f Removing unused jdom dependency
098df3f is described below
commit 098df3febb30f7c51f616d179efef2f7140d76b8
Author: Colm O hEigeartaigh
AuthorDate: Mon May 27 15:34:40 2019 +0100
Removing unused jdom dependency
---
components/camel-gora/pom.xml | 5 -
1 file changed, 5 deletions(-)
diff --git a/components/camel-gora/pom.xml b/components/camel-gora/pom.xml
index 8cee508..83496aa 100644
--- a/components/camel-gora/pom.xml
+++ b/components/camel-gora/pom.xml
@@ -136,11 +136,6 @@
${jackson-version}
-org.apache.servicemix.bundles
-org.apache.servicemix.bundles.jdom
-${jdom-bundle-version}
-
-
com.google.guava
guava
[camel-website] branch phrasing created (now 7f4c804)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch phrasing in repository https://gitbox.apache.org/repos/asf/camel-website.git. at 7f4c804 More phrasing This branch includes the following new commits: new 7f4c804 More phrasing The 1 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.
[camel-website] 01/01: More phrasing
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch phrasing in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 7f4c80425d52c91a30f9d517e6e40f7680e15d21 Author: Andrea Cosentino AuthorDate: Mon May 27 16:30:18 2019 +0200 More phrasing --- layouts/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/index.html b/layouts/index.html index 484f3ea..054e4cf 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -17,7 +17,7 @@ Apache Camel provides support -Bean Binding and seamless integration with popular frameworks such as CDI, Spring, Blueprint and Guice +Bean Binding and seamless integration with popular frameworks such as CDI, Spring, Spring Boot and Blueprint. @@ -45,9 +45,9 @@ -Data Format +Data Formats -Camel supports around 50 data formats, allowing to create messages to be translated. +Camel supports around 50 data formats, allowing to translate messages in multiple formats.
[camel] 01/02: CAMEL-13471 - Aligned the Karaf feature
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 64c9e2daf1ade0a8e0445f173f779baae606c53a
Author: Andrea Cosentino
AuthorDate: Tue Apr 30 16:00:37 2019 +0200
CAMEL-13471 - Aligned the Karaf feature
---
platforms/karaf/features/src/main/resources/features.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 628db66..3f0fd96 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -408,6 +408,7 @@
camel-core
wrap:mvn:org.eclipse.californium/californium-core/${californium-version}
wrap:mvn:org.eclipse.californium/element-connector/${californium-version}
+
wrap:mvn:org.eclipse.californium/element-connector-tcp/${californium-version}
wrap:mvn:org.eclipse.californium/scandium/${californium-version}
mvn:org.apache.camel/camel-coap/${project.version}
[camel] branch master updated (95fb571 -> 669739f)
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 95fb571 Adding netty deps to camel-coap feature, which are required for tcp connector new b97c1f1 Camel-AWS SQS: Updated docs new 669739f 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: components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc | 2 +- docs/components/modules/ROOT/pages/aws-sqs-component.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] 01/02: Camel-AWS SQS: Updated 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 b97c1f12e2adf9359a92970a06961c30bde7b274
Author: Andrea Cosentino
AuthorDate: Mon May 27 16:23:31 2019 +0200
Camel-AWS SQS: Updated docs
---
components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
b/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
index 89a046e..b9a7016 100644
--- a/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
+++ b/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
@@ -287,7 +287,7 @@
from("aws-sqs://MyQueue?amazonSQSClient=#client=5000=5"
.to("mock:result");
-
-In this example if the MyQueue queue is not already created on AWS, it will be
created with default parameters from the
+In this example if the MyQueue queue is not already created on AWS (and the
autoCreateQueue option is set to true), it will be created with default
parameters from the
SQS configuration. If it's already up on AWS, the SQS configuration options
will be used to override the existent AWS configuration.
DelayQueue VS Delay for Single message
[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 669739f1d36d3b457f7ccbbbe1a10641cb3955ac
Author: Andrea Cosentino
AuthorDate: Mon May 27 16:24:50 2019 +0200
Regen docs
---
docs/components/modules/ROOT/pages/aws-sqs-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
b/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
index 89a046e..b9a7016 100644
--- a/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
@@ -287,7 +287,7 @@
from("aws-sqs://MyQueue?amazonSQSClient=#client=5000=5"
.to("mock:result");
-
-In this example if the MyQueue queue is not already created on AWS, it will be
created with default parameters from the
+In this example if the MyQueue queue is not already created on AWS (and the
autoCreateQueue option is set to true), it will be created with default
parameters from the
SQS configuration. If it's already up on AWS, the SQS configuration options
will be used to override the existent AWS configuration.
DelayQueue VS Delay for Single message
[camel] branch camel-2.x updated (cf7186d -> 0c20c3a)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git. from cf7186d CAMEL-13471 - Adding more tests new 64c9e2d CAMEL-13471 - Aligned the Karaf feature new 0c20c3a Adding netty deps to camel-coap feature, which are required for tcp connector 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: platforms/karaf/features/src/main/resources/features.xml | 7 +++ 1 file changed, 7 insertions(+)
[camel] 02/02: Adding netty deps to camel-coap feature, which are required for tcp connector
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0c20c3a91274d03dc598a2074a562ee5c12909ba
Author: Colm O hEigeartaigh
AuthorDate: Mon May 27 15:24:43 2019 +0100
Adding netty deps to camel-coap feature, which are required for tcp
connector
---
platforms/karaf/features/src/main/resources/features.xml | 6 ++
1 file changed, 6 insertions(+)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 3f0fd96..84cd3ad 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -406,6 +406,12 @@
camel-core
+mvn:io.netty/netty-buffer/${netty-version}
+mvn:io.netty/netty-codec/${netty-version}
+mvn:io.netty/netty-common/${netty-version}
+mvn:io.netty/netty-handler/${netty-version}
+mvn:io.netty/netty-resolver/${netty-version}
+mvn:io.netty/netty-transport/${netty-version}
wrap:mvn:org.eclipse.californium/californium-core/${californium-version}
wrap:mvn:org.eclipse.californium/element-connector/${californium-version}
wrap:mvn:org.eclipse.californium/element-connector-tcp/${californium-version}
[camel] branch master updated: Adding netty deps to camel-coap feature, which are required for tcp connector
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 95fb571 Adding netty deps to camel-coap feature, which are required
for tcp connector
95fb571 is described below
commit 95fb57190271cbb7de3031108569d8c7e6b3cb20
Author: Colm O hEigeartaigh
AuthorDate: Mon May 27 15:24:43 2019 +0100
Adding netty deps to camel-coap feature, which are required for tcp
connector
---
platforms/karaf/features/src/main/resources/features.xml | 6 ++
1 file changed, 6 insertions(+)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index afd8ac0..3e2ffe9 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -674,6 +674,12 @@
camel-core
+mvn:io.netty/netty-buffer/${netty-version}
+mvn:io.netty/netty-codec/${netty-version}
+mvn:io.netty/netty-common/${netty-version}
+mvn:io.netty/netty-handler/${netty-version}
+mvn:io.netty/netty-resolver/${netty-version}
+mvn:io.netty/netty-transport/${netty-version}
wrap:mvn:org.eclipse.californium/californium-core/${californium-version}
wrap:mvn:org.eclipse.californium/element-connector/${californium-version}
wrap:mvn:org.eclipse.californium/element-connector-tcp/${californium-version}
[camel-website] branch asf-site updated: Website updated to 89eb3d4
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 e12b026 Website updated to 89eb3d4 e12b026 is described below commit e12b0265e4d99ad646892963c653f26d7449789e Author: jenkins AuthorDate: Mon May 27 14:19:31 2019 + Website updated to 89eb3d4 --- index.html | 2 +- sitemap-camel-k.xml| 42 +-- sitemap-components.xml | 746 - sitemap-manual.xml | 402 +- 4 files changed, 596 insertions(+), 596 deletions(-) diff --git a/index.html b/index.html index 3d72a0e..c65fd82 100644 --- a/index.html +++ b/index.html @@ -3,4 +3,4 @@
[camel-website] branch index-phrasinfg deleted (was db34473)
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a change to branch index-phrasinfg in repository https://gitbox.apache.org/repos/asf/camel-website.git. was db34473 Camel layout: Changing the phrasing a bit The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-website] 01/01: Merge pull request #40 from apache/index-phrasinfg
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-website.git commit ec904b35a4d90cd7959a16af051e7186f25a481d Merge: 6e1e4a5 db34473 Author: Andrea Cosentino AuthorDate: Mon May 27 16:10:18 2019 +0200 Merge pull request #40 from apache/index-phrasinfg Camel layout: Changing the phrasing a bit layouts/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[camel-website] branch master updated (6e1e4a5 -> ec904b3)
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-website.git. from 6e1e4a5 Merge pull request #39 from apache/cve-2019-0188 add db34473 Camel layout: Changing the phrasing a bit new ec904b3 Merge pull request #40 from apache/index-phrasinfg The 1 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: layouts/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[camel-website] 01/01: Camel layout: Changing the phrasing a bit
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch index-phrasinfg in repository https://gitbox.apache.org/repos/asf/camel-website.git commit db34473326092d38b07bb29e836ee364d35d5c8f Author: Andrea Cosentino AuthorDate: Mon May 27 15:58:19 2019 +0200 Camel layout: Changing the phrasing a bit --- layouts/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/index.html b/layouts/index.html index 7d4a9bc..484f3ea 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -27,7 +27,7 @@ Enterprise Integration Patterns -Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. +Camel supports most of the Enterprise Integration Patterns from the excellent book by Gregor Hohpe and Bobby Woolf. @@ -37,7 +37,7 @@ Components -Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. +Camel supports around 300 components, creating integration with everything. @@ -47,7 +47,7 @@ Data Format -Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. +Camel supports around 50 data formats, allowing to create messages to be translated.
[camel-website] branch index-phrasinfg created (now db34473)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch index-phrasinfg in repository https://gitbox.apache.org/repos/asf/camel-website.git. at db34473 Camel layout: Changing the phrasing a bit This branch includes the following new commits: new db34473 Camel layout: Changing the phrasing a bit The 1 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.
[camel] 01/02: Indent comment to make it a multiline todo
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 3588e69fadc502b16085a3d334705a2b30e3c549
Author: Guillaume Nodet
AuthorDate: Wed May 22 20:08:28 2019 +0200
Indent comment to make it a multiline todo
---
.../java/org/apache/camel/impl/engine/DefaultUnitOfWork.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
index 488f030..78a24f2 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
@@ -55,11 +55,11 @@ public class DefaultUnitOfWork implements UnitOfWork,
Service {
private static final Logger LOG =
LoggerFactory.getLogger(DefaultUnitOfWork.class);
// TODO: This implementation seems to have transformed itself into a to
broad concern
-// where unit of work is doing a bit more work than the transactional
aspect that ties
-// to its name. Maybe this implementation should be named ExchangeContext
and we can
-// introduce a simpler UnitOfWork concept. This would also allow us to
refactor the
-// SubUnitOfWork into a general parent/child unit of work concept. However
this
-// requires API changes and thus is best kept for Camel 3.0
+// where unit of work is doing a bit more work than the transactional
aspect that ties
+// to its name. Maybe this implementation should be named
ExchangeContext and we can
+// introduce a simpler UnitOfWork concept. This would also allow us to
refactor the
+// SubUnitOfWork into a general parent/child unit of work concept.
However this
+// requires API changes and thus is best kept for Camel 3.0
private UnitOfWork parent;
private String id;
[camel] branch master updated (7c34a57 -> f15cad8)
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 7c34a57 Upgrade Rabbitmq to version 5.7.1
new 3588e69 Indent comment to make it a multiline todo
new f15cad8 [CAMEL-13371] Isolate more xml stuff in camel-jaxp
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:
.../component/cxf/converter/CachedCxfPayload.java | 2 +-
components/camel-jclouds/pom.xml | 5 ++
.../component/jclouds/JcloudsPayloadConverter.java | 2 +-
.../jclouds/JcloudsBlobStoreProducerTest.java | 4 +-
.../camel/component/jms/JmsXMLRouteTest.java | 2 +-
.../component/restlet/DefaultRestletBinding.java | 2 +-
.../camel/component/xquery/XQueryBuilder.java | 5 +-
.../camel/converter/saxon/SaxonConverterTest.java | 2 +-
.../spring/ws/converter/StringSourceConverter.java | 2 +-
.../spring/ws/ProducerLocalRouteTest.java | 2 +-
.../spring/ws/ProducerRemoteRouteTest.java | 2 +-
.../processor/XmlSignatureProcessor.java | 2 +-
.../camel/impl/engine/DefaultUnitOfWork.java | 10 ++--
.../apache/camel/converter/StringSourceTest.java | 2 +-
.../camel/converter/jaxp/BytesSourceTest.java | 2 +-
.../camel/converter/jaxp/XmlConverterTest.java | 2 +-
.../camel/converter/stream/SourceCacheTest.java| 1 +
.../converter/stream/StreamCacheConverterTest.java | 9 ++--
.../converter/stream/StreamSourceCacheTest.java| 1 +
.../apache/camel/impl/LogDebugBodyStreamsTest.java | 2 +-
.../MultiCastParallelAndStreamCachingTest.java | 2 +-
.../StreamSourceContentBasedRouterTest.java| 2 +-
.../ValidatingProcessorFromSourceTest.java | 2 +-
.../camel/processor/ValidatingProcessorTest.java | 2 +-
.../apache/camel/converter/jaxp/XmlConverter.java | 4 +-
.../org/apache/camel/util/xml}/BytesSource.java| 2 +-
.../org/apache/camel/util/xml}/SourceCache.java| 5 +-
.../apache/camel/util/xml}/StreamSourceCache.java | 4 +-
.../camel/util/xml/StreamSourceConverter.java} | 61 ++
.../org/apache/camel/util/xml}/StringSource.java | 2 +-
.../converter/stream/StreamCacheConverter.java | 36 -
.../org/apache/camel/support/MessageHelper.java| 19 ---
32 files changed, 64 insertions(+), 138 deletions(-)
rename core/{camel-api/src/main/java/org/apache/camel =>
camel-jaxp/src/main/java/org/apache/camel/util/xml}/BytesSource.java (98%)
rename core/{camel-support/src/main/java/org/apache/camel/converter/stream =>
camel-jaxp/src/main/java/org/apache/camel/util/xml}/SourceCache.java (93%)
rename core/{camel-support/src/main/java/org/apache/camel/converter/stream =>
camel-jaxp/src/main/java/org/apache/camel/util/xml}/StreamSourceCache.java (96%)
copy
core/{camel-support/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java
=>
camel-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceConverter.java}
(50%)
rename core/{camel-api/src/main/java/org/apache/camel =>
camel-jaxp/src/main/java/org/apache/camel/util/xml}/StringSource.java (99%)
[camel] 02/02: [CAMEL-13371] Isolate more xml stuff in camel-jaxp
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 f15cad8e430510e00b4e8f57664eab56c756317f Author: Guillaume Nodet AuthorDate: Wed May 22 20:41:00 2019 +0200 [CAMEL-13371] Isolate more xml stuff in camel-jaxp --- .../component/cxf/converter/CachedCxfPayload.java | 2 +- components/camel-jclouds/pom.xml | 5 ++ .../component/jclouds/JcloudsPayloadConverter.java | 2 +- .../jclouds/JcloudsBlobStoreProducerTest.java | 4 +- .../camel/component/jms/JmsXMLRouteTest.java | 2 +- .../component/restlet/DefaultRestletBinding.java | 2 +- .../camel/component/xquery/XQueryBuilder.java | 5 +- .../camel/converter/saxon/SaxonConverterTest.java | 2 +- .../spring/ws/converter/StringSourceConverter.java | 2 +- .../spring/ws/ProducerLocalRouteTest.java | 2 +- .../spring/ws/ProducerRemoteRouteTest.java | 2 +- .../processor/XmlSignatureProcessor.java | 2 +- .../apache/camel/converter/StringSourceTest.java | 2 +- .../camel/converter/jaxp/BytesSourceTest.java | 2 +- .../camel/converter/jaxp/XmlConverterTest.java | 2 +- .../camel/converter/stream/SourceCacheTest.java| 1 + .../converter/stream/StreamCacheConverterTest.java | 9 ++-- .../converter/stream/StreamSourceCacheTest.java| 1 + .../apache/camel/impl/LogDebugBodyStreamsTest.java | 2 +- .../MultiCastParallelAndStreamCachingTest.java | 2 +- .../StreamSourceContentBasedRouterTest.java| 2 +- .../ValidatingProcessorFromSourceTest.java | 2 +- .../camel/processor/ValidatingProcessorTest.java | 2 +- .../apache/camel/converter/jaxp/XmlConverter.java | 4 +- .../org/apache/camel/util/xml}/BytesSource.java| 2 +- .../org/apache/camel/util/xml}/SourceCache.java| 5 +- .../apache/camel/util/xml}/StreamSourceCache.java | 4 +- .../camel/util/xml/StreamSourceConverter.java} | 61 ++ .../org/apache/camel/util/xml}/StringSource.java | 2 +- .../converter/stream/StreamCacheConverter.java | 36 - .../org/apache/camel/support/MessageHelper.java| 19 --- 31 files changed, 59 insertions(+), 133 deletions(-) diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java index 70f63c8..7764cd7 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java @@ -38,7 +38,7 @@ import org.apache.camel.Exchange; import org.apache.camel.StreamCache; import org.apache.camel.component.cxf.CxfPayload; import org.apache.camel.converter.stream.CachedOutputStream; -import org.apache.camel.converter.stream.StreamSourceCache; +import org.apache.camel.util.xml.StreamSourceCache; import org.apache.camel.support.builder.xml.StAX2SAXSource; import org.apache.camel.support.builder.xml.XMLConverterHelper; import org.apache.camel.util.ObjectHelper; diff --git a/components/camel-jclouds/pom.xml b/components/camel-jclouds/pom.xml index a21cb50..66a19f5 100644 --- a/components/camel-jclouds/pom.xml +++ b/components/camel-jclouds/pom.xml @@ -49,6 +49,11 @@ camel-support + +org.apache.camel +camel-jaxp + + org.apache.jclouds diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsPayloadConverter.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsPayloadConverter.java index e7fec3f..398a458 100644 --- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsPayloadConverter.java +++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsPayloadConverter.java @@ -31,10 +31,10 @@ import org.apache.camel.Converter; import org.apache.camel.Exchange; import org.apache.camel.TypeConverter; import org.apache.camel.WrappedFile; -import org.apache.camel.converter.stream.StreamSourceCache; import org.apache.camel.spi.TypeConverterRegistry; import org.apache.camel.support.ExchangeHelper; import org.apache.camel.util.ObjectHelper; +import org.apache.camel.util.xml.StreamSourceCache; import org.jclouds.io.Payload; import org.jclouds.io.payloads.ByteSourcePayload; import org.jclouds.io.payloads.InputStreamPayload; diff --git a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java index 1a2cda8..7c55b80 100644 ---
[camel] branch master updated: Upgrade Rabbitmq to version 5.7.1
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 7c34a57 Upgrade Rabbitmq to version 5.7.1 7c34a57 is described below commit 7c34a572d928f19d93cf9672d6f7b63ccbeb1365 Author: Andrea Cosentino AuthorDate: Mon May 27 15:19:57 2019 +0200 Upgrade Rabbitmq to version 5.7.1 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index b29c70f..be15480 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -571,7 +571,7 @@ 0.42.0 2.3.1 2.1.1 -5.7.0 +5.7.1 1.0.2 3.2.9.RELEASE 0.9.11
[camel-website] branch asf-site updated: Website updated to 955d432
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 89eb3d4 Website updated to 955d432 89eb3d4 is described below commit 89eb3d4e38d47a20ad7a225c5f7ac37c3a9dfbc9 Author: jenkins AuthorDate: Mon May 27 12:54:13 2019 + Website updated to 955d432 --- index.xml | 2 +- security/CVE-2019-0188.html| 1 + security/CVE-2019-0188.txt.asc | 25 ++ security/index.html| 2 +- security/index.xml | 2 +- sitemap-camel-k.xml| 42 +-- sitemap-components.xml | 746 - sitemap-manual.xml | 402 +++--- 8 files changed, 624 insertions(+), 598 deletions(-) diff --git a/index.xml b/index.xml index d294ae1..231fee1 100644 --- a/index.xml +++ b/index.xml @@ -1,4 +1,4 @@ -http://www.w3.org/2005/Atom;>Apache Camelhttps://camel.apache.org/Recent content on Apache CamelHugo -- gohugo.ioen-usSun, 12 May 2019 00:00:00 +https://camel.apache.org/index.xml; rel="self" type="application/rss+xml"/>RELEASE 2.24. [...] +http://www.w3.org/2005/Atom;>Apache Camelhttps://camel.apache.org/Recent content on Apache CamelHugo -- gohugo.ioen-usMon, 27 May 2019 12:58:33 +0200https://camel.apache.org/index.xml; rel="self" type="application/rss+xml"/>Apache Camel [...] The artifacts are published and ready for you to download either from the Apache mirrors or from the Central Maven repository. For more details please take a look at the release notes. Many thanks to all who made this release possible.Apache Camel Security Advisory - CVE-2019-0194https://camel.apache.org/security/CVE-2019-0194.htmlTue, 30 Apr 2019 18:29:00 +https://camel.apache.org/security/CVE-2019-0194.htmlThe JIRA ticket: https://issues.apache.org/jira/browse/CAMEL-13042 refers to the various commits that resovoled the issue, and have more details.https://issues.apache.org/jira/browse/CAMEL-9309 refers to the various commits that resovoled the issue.Apache Camel Security Advisory - CVE-2015-5344https://camel.apache.org/security/CVE-2015-5344.htmlWed, 03 Feb 2016 13:59:00 +https://camel.apache.org/security/CVE-2015-5344.htmlThe JIRA ticket: https://issues.apache.org/jira/browse/CAMEL-9297 refers to the various co [...] diff --git a/security/CVE-2019-0188.html b/security/CVE-2019-0188.html new file mode 100644 index 000..06fd29d --- /dev/null +++ b/security/CVE-2019-0188.html @@ -0,0 +1 @@ +Apache Camel Security Advisory - CVE-2019-0188 - Apache Camel
[camel-website] branch cve-2019-0188 deleted (was f4c4e7a)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch cve-2019-0188 in repository https://gitbox.apache.org/repos/asf/camel-website.git. was f4c4e7a Added CVE-2019-0188 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-website] 01/01: Merge pull request #39 from apache/cve-2019-0188
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-website.git commit 6e1e4a559f7476c65764061c7e716d2ac2a5a220 Merge: 0ceba42 f4c4e7a Author: Andrea Cosentino AuthorDate: Mon May 27 14:49:11 2019 +0200 Merge pull request #39 from apache/cve-2019-0188 Added CVE-2019-0188 content/security/CVE-2019-0188.md | 15 +++ content/security/CVE-2019-0188.txt.asc | 25 + static/.htaccess | 1 - yarn.lock | 196 - 4 files changed, 132 insertions(+), 105 deletions(-)
[camel-website] branch master updated (0ceba42 -> 6e1e4a5)
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-website.git. from 0ceba42 Yarn updated inside antora add f4c4e7a Added CVE-2019-0188 new 6e1e4a5 Merge pull request #39 from apache/cve-2019-0188 The 1 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: content/security/CVE-2019-0188.md | 15 +++ content/security/CVE-2019-0188.txt.asc | 25 + static/.htaccess | 1 - yarn.lock | 196 - 4 files changed, 132 insertions(+), 105 deletions(-) create mode 100644 content/security/CVE-2019-0188.md create mode 100644 content/security/CVE-2019-0188.txt.asc
[camel] branch master updated: Fixed CVE number for Camel-XMLJson
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 69b6d1d Fixed CVE number for Camel-XMLJson 69b6d1d is described below commit 69b6d1da88d7362a8eaa31cb8f0bffc795030c4d Author: Andrea Cosentino AuthorDate: Mon May 27 12:29:46 2019 +0200 Fixed CVE number for Camel-XMLJson --- docs/user-manual/en/security-advisories.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/en/security-advisories.adoc b/docs/user-manual/en/security-advisories.adoc index dbdc847..606acd5 100644 --- a/docs/user-manual/en/security-advisories.adoc +++ b/docs/user-manual/en/security-advisories.adoc @@ -2,7 +2,7 @@ ### 2019 -link:security-advisories/CVE-2019-0194.txt.asc[CVE-2019-0188] - Apache Camel-XMLJson +link:security-advisories/CVE-2019-0188.txt.asc[CVE-2019-0188] - Apache Camel-XMLJson vulnerable to XML external entity injection (XXE) link:security-advisories/CVE-2019-0194.txt.asc[CVE-2019-0194] - Apache
[camel-website] branch cve-2019-0188 created (now f4c4e7a)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch cve-2019-0188 in repository https://gitbox.apache.org/repos/asf/camel-website.git. at f4c4e7a Added CVE-2019-0188 This branch includes the following new commits: new f4c4e7a Added CVE-2019-0188 The 1 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.
[camel-website] 01/01: Added CVE-2019-0188
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch cve-2019-0188 in repository https://gitbox.apache.org/repos/asf/camel-website.git commit f4c4e7a8b017001232a6f69c0a6f2612097a7bb4 Author: Andrea Cosentino AuthorDate: Mon May 27 14:29:40 2019 +0200 Added CVE-2019-0188 --- content/security/CVE-2019-0188.md | 15 +++ content/security/CVE-2019-0188.txt.asc | 25 + static/.htaccess | 1 - yarn.lock | 196 - 4 files changed, 132 insertions(+), 105 deletions(-) diff --git a/content/security/CVE-2019-0188.md b/content/security/CVE-2019-0188.md new file mode 100644 index 000..5e84de9 --- /dev/null +++ b/content/security/CVE-2019-0188.md @@ -0,0 +1,15 @@ +--- +title: "Apache Camel Security Advisory - CVE-2019-0188" +url: /security/CVE-2019-0188.html +date: 2019-05-27T12:58:33+02:00 +draft: false +type: security-advisory +cve: CVE-2019-0188 +severity: MEDIUM +summary: "Apache Camel-XMLJson vulnerable to XML external entity injection (XXE)" +description: "Apache Camel provided contains an XML external entity injection (XXE) vulnerability (CWE-611) due to using an outdated vulnerable JSON-lib library. This affects only the camel-xmljson component, which was removed." +mitigation: "Update to version 2.24.0" +affected: Apache Camel versions prior to 2.24.0 +fixed: 2.24.0 +--- + diff --git a/content/security/CVE-2019-0188.txt.asc b/content/security/CVE-2019-0188.txt.asc new file mode 100644 index 000..f6d70be --- /dev/null +++ b/content/security/CVE-2019-0188.txt.asc @@ -0,0 +1,25 @@ +-BEGIN PGP SIGNED MESSAGE- +Hash: SHA1 + +CVE-2019-0188: Apache Camel-XMLJson vulnerable to XML external entity injection (XXE) + +Severity: MEDIUM + +Vendor: The Apache Software Foundation + +Versions Affected: Apache Camel versions prior to 2.24.0 + +Description: Apache Camel provided contains an XML external entity injection (XXE) vulnerability (CWE-611) due to using an outdated vulnerable JSON-lib library. This affects only the camel-xmljson component, which was removed. + +Mitigation: Update to version 2.24.0 +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQEcBAEBAgAGBQJc57YJAAoJEONOnzgC/0EAI1oIAITlFL/xUHp0rEn5WaRoCbGE +49ZYJ2/bwK94se0KMhT5VqF6mYf1BWMSVzrczN+Qm8bEb1tQPDZFnTUe0hUjMN61 +tJpGK1UPCOUm3rBVSmrkbYclBVCBgxIEjfeP7SAtBXZSQ7/SHLBG8OQWRur7CPml +6qtDt9WqIV0da9hJgP2n0YExqyfbCb0IZkvo23DWlzAHZ0LCVc7V/lDqGG1cWsZw +gEMtUfbaz4533vr5+LgST3z7AbnMBpk2P29/9M7Z3wOxtS2Ne6aw/ooJfRh/HJ5k +sw4jNQ/4txaha4BszSH9Ibdm0nMyzlmv0u8nONM0X2hhxasybMXIdPlTJh308BU= +=w7Pn +-END PGP SIGNATURE- diff --git a/static/.htaccess b/static/.htaccess index cd36cc5..4e3c2d1 100644 --- a/static/.htaccess +++ b/static/.htaccess @@ -1,3 +1,2 @@ RewriteEngine on RewriteRule "security-advisories.data/(.+)$" "security/$1" [R=permanent,L] - diff --git a/yarn.lock b/yarn.lock index 0eb0b71..c9afcf7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -146,9 +146,9 @@ vinyl-fs "^3.0.3" "@babel/runtime@^7.1.5": - version "7.4.3" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.3.tgz#79888e452034223ad9609187a0ad1fe0d2ad4bdc; - integrity sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA== + version "7.4.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12; + integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ== dependencies: regenerator-runtime "^0.13.2" @@ -188,9 +188,9 @@ defer-to-connect "^1.0.1" "@types/node@*": - version "11.13.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.6.tgz#37ec75690830acb0d74ce3c6c43caab787081e85; - integrity sha512-Xoo/EBzEe8HxTSwaZNLZjaW6M6tA/+GmD3/DZ6uo8qSaolE/9Oarko0oV1fVfrLqOz0tx0nXJB4rdD5c+vixLw== + version "12.0.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40; + integrity sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA== "@types/q@^1.5.1": version "1.5.2" @@ -603,9 +603,9 @@ bl@^2.1.2: safe-buffer "^5.1.1" bluebird@^3.5.1: - version "3.5.4" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714; - integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw== + version "3.5.5" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f; + integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w== boolbase@^1.0.0, boolbase@~1.0.0: version "1.0.0" @@ -778,9 +778,9 @@ camelcase-keys@^4.0.0: quick-lru "^1.0.0" camelcase-keys@^5.0.0: - version "5.1.0" -
[camel] branch master updated: CAMEL-13582: Camel main - init to initialize as much as possible
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 1ba6715 CAMEL-13582: Camel main - init to initialize as much as
possible
1ba6715 is described below
commit 1ba67159035f882b06be7757b25fb047c1e84069
Author: Claus Ibsen
AuthorDate: Mon May 27 13:12:26 2019 +0200
CAMEL-13582: Camel main - init to initialize as much as possible
---
.../src/main/java/org/apache/camel/main/Main.java | 8 +++-
.../src/test/java/org/apache/camel/main/MainIoCTest.java | 15 +++
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/core/camel-core/src/main/java/org/apache/camel/main/Main.java
b/core/camel-core/src/main/java/org/apache/camel/main/Main.java
index cbea1d2..ffa5e56 100644
--- a/core/camel-core/src/main/java/org/apache/camel/main/Main.java
+++ b/core/camel-core/src/main/java/org/apache/camel/main/Main.java
@@ -101,10 +101,16 @@ public class Main extends MainSupport {
// Implementation methods
//
-
+
+@Override
+protected void doInit() throws Exception {
+super.doInit();
+initCamelContext();
+}
+
@Override
protected void doStart() throws Exception {
super.doStart();
-initCamelContext();
if (getCamelContext() != null) {
try {
// if we were veto started then mark as completed
diff --git
a/core/camel-core/src/test/java/org/apache/camel/main/MainIoCTest.java
b/core/camel-core/src/test/java/org/apache/camel/main/MainIoCTest.java
index a7e26ee..adeb94b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/main/MainIoCTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/main/MainIoCTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.seda.BlockingQueueFactory;
import org.apache.camel.component.seda.PriorityBlockingQueueFactory;
import org.apache.camel.component.seda.SedaComponent;
+import org.apache.camel.model.ModelCamelContext;
import org.junit.Assert;
import org.junit.Test;
@@ -41,6 +42,20 @@ public class MainIoCTest extends Assert {
main.addRouteBuilder(MyRouteBuilder.class);
// manually bind
main.bind("myBar", new MyBar());
+
+// should be null before init
+assertNull(main.getCamelContext());
+// for testing that we can init camel and it has loaded configuration
and routes and whatnot
+main.init();
+// and now its created
+assertNotNull(main.getCamelContext());
+// should be 1 route model
+assertEquals(1,
main.getCamelContext().adapt(ModelCamelContext.class).getRouteDefinitions().size());
+// and the configuration should have registered beans
+
assertNotNull(main.getCamelContext().getRegistry().lookupByName("MyCoolBean"));
+assertEquals("Tiger",
main.getCamelContext().getRegistry().lookupByName("coolStuff"));
+
+// start it
main.start();
CamelContext camelContext = main.getCamelContext();
[camel] branch camel-2.x updated (8c58923 -> cf7186d)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 8c58923 Removing unused import
new 44343e8 CAMEL-13471 - Adding support for coap+tcp
new 45fea2b Refactoring Coap component to use sslContextParameters for
TLS certificates
new 8239d22 CAMEL-13471 - Added TLS + TCP support
new 12e4b92 CAMEL-13471 - Adding rest component tests for coap + various
protocols
new 8901eea CAMEL-13471 - Updating docs
new 17e7ff6 Fixing table columns
new cf7186d CAMEL-13471 - Adding more tests
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-coap/pom.xml | 5 +
.../camel-coap/src/main/docs/coap-component.adoc | 30 +-
.../java/org/apache/camel/coap/CoAPComponent.java | 34 +-
.../java/org/apache/camel/coap/CoAPEndpoint.java | 245 ++--
.../java/org/apache/camel/coap/CoAPProducer.java | 32 +-
.../org/apache/camel/component/{coaps => coap+tcp} | 0
.../apache/camel/component/{coaps => coaps+tcp}| 0
.../camel/coap/CoAPComponentTCPTLSTest.java} | 20 +-
.../apache/camel/coap/CoAPComponentTLSTest.java| 303 +--
.../camel/coap/CoAPComponentTLSTestBase.java | 431 +
.../org/apache/camel/coap/CoAPComponentTest.java | 28 +-
.../camel/coap/CoAPRestComponentTCPTLSTest.java| 111 ++
.../camel/coap/CoAPRestComponentTCPTest.java | 56 +++
.../camel/coap/CoAPRestComponentTLSTest.java | 125 +++---
.../apache/camel/coap/CoAPRestComponentTest.java | 101 +
...entTest.java => CoAPRestComponentTestBase.java} | 69 +++-
.../springboot/CoAPComponentAutoConfiguration.java | 3 +-
17 files changed, 985 insertions(+), 608 deletions(-)
copy
components/camel-coap/src/main/resources/META-INF/services/org/apache/camel/component/{coaps
=> coap+tcp} (100%)
copy
components/camel-coap/src/main/resources/META-INF/services/org/apache/camel/component/{coaps
=> coaps+tcp} (100%)
copy
components/{camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/LogSpanDecorator.java
=>
camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTCPTLSTest.java}
(73%)
create mode 100644
components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
create mode 100644
components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTCPTLSTest.java
create mode 100644
components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTCPTest.java
copy
components/camel-coap/src/test/java/org/apache/camel/coap/{CoAPRestComponentTest.java
=> CoAPRestComponentTestBase.java} (62%)
[camel] 02/07: Refactoring Coap component to use sslContextParameters for TLS certificates
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git commit 45fea2b9a74e89ce3c006032ee8ea79cbadd28c9 Author: Colm O hEigeartaigh AuthorDate: Thu May 2 12:53:32 2019 +0100 Refactoring Coap component to use sslContextParameters for TLS certificates --- .../camel-coap/src/main/docs/coap-component.adoc | 13 +- .../java/org/apache/camel/coap/CoAPComponent.java | 3 +- .../java/org/apache/camel/coap/CoAPEndpoint.java | 233 + .../java/org/apache/camel/coap/CoAPProducer.java | 3 +- .../apache/camel/coap/CoAPComponentTLSTest.java| 208 -- .../camel/coap/CoAPRestComponentTLSTest.java | 25 ++- 6 files changed, 276 insertions(+), 209 deletions(-) diff --git a/components/camel-coap/src/main/docs/coap-component.adoc b/components/camel-coap/src/main/docs/coap-component.adoc index 3cb957b..e3c7c6b 100644 --- a/components/camel-coap/src/main/docs/coap-component.adoc +++ b/components/camel-coap/src/main/docs/coap-component.adoc @@ -50,28 +50,25 @@ with the following path and query parameters: |=== - Query Parameters (16 parameters): + Query Parameters (13 parameters): [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *alias* (common) | Sets the alias used to query the KeyStore for the private key and certificate. | | String -| *cipherSuites* (common) | Sets the cipherSuites String. This is a comma separated String of ciphersuites to configure. | | String -| *keystore* (common) | Sets the TLS key store. Alternatively, a KeyStoreParameters object can be configured instead. An alias and password should also be configured on the route definition. | | KeyStore -| *keyStoreParameters* (common) | The KeyStoreParameters object to use with TLS to configure the keystore. Alternatively, a keystore parameter can be directly configured instead. An alias and password should also be configured on the route definition. | | KeyStoreParameters +| *alias* (common) | Sets the alias used to query the KeyStore for the private key and certificate. This parameter is used when we are enabling TLS with certificates on the service side, and similarly on the client side when TLS is used with certificates and client authentication. If the parameter is not specified then the default behavior is to use the first alias in the keystore that contains a key entry. This configuration parameter does not apply to configuring TLS via a Raw Public K [...] +| *cipherSuites* (common) | Sets the cipherSuites String. This is a comma separated String of ciphersuites to configure. If it is not specified, then it falls back to getting the ciphersuites from the sslContextParameters object. | | String +| *clientAuthentication* (common) | Sets the configuration options for server-side client-authentication requirements. The value must be one of NONE, WANT, REQUIRE. If this value is not specified, then it falls back to checking the sslContextParameters.getServerParameters().getClientAuthentication() value. | | String | *privateKey* (common) | Set the configured private key for use with Raw Public Key. | | PrivateKey | *pskStore* (common) | Set the PskStore to use for pre-shared key. | | PskStore | *publicKey* (common) | Set the configured public key for use with Raw Public Key. | | PublicKey +| *sslContextParameters* (common) | Set the SSLContextParameters object for setting up TLS. This is required for coapstcp, and for coaps when we are using certificates for TLS (as opposed to RPK or PKS). | | SSLContextParameters | *trustedRpkStore* (common) | Set the TrustedRpkStore to use to determine trust in raw public keys. | | TrustedRpkStore -| *truststore* (common) | Sets the TLS trust store. Alternatively, a trustStoreParameters object can be configured instead. All certificates in the truststore are used to establish trust. | | KeyStore -| *trustStoreParameters* (common) | The KeyStoreParameters object to use with TLS to configure the truststore. Alternatively, a truststore object can be directly configured instead. All certificates in the truststore are used to establish trust. | | KeyStoreParameters | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *coapMethodRestrict* (consumer) | Comma separated list of methods that the CoAP consumer will bind to. The default is to bind to all methods (DELETE, GET, POST, PUT). | | String | *exceptionHandler* (consumer)
[camel] 04/07: CAMEL-13471 - Adding rest component tests for coap + various protocols
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 12e4b92fe9c10cd1f7aa9329ff54fedee46e69cc
Author: Colm O hEigeartaigh
AuthorDate: Fri May 3 11:59:02 2019 +0100
CAMEL-13471 - Adding rest component tests for coap + various protocols
---
.../camel/coap/CoAPRestComponentTCPTLSTest.java| 111 +
.../camel/coap/CoAPRestComponentTCPTest.java | 107 +++-
.../camel/coap/CoAPRestComponentTLSTest.java | 106
.../apache/camel/coap/CoAPRestComponentTest.java | 101 +++
...TCPTest.java => CoAPRestComponentTestBase.java} | 83 ++-
5 files changed, 243 insertions(+), 265 deletions(-)
diff --git
a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTCPTLSTest.java
b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTCPTLSTest.java
new file mode 100644
index 000..79cd084
--- /dev/null
+++
b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTCPTLSTest.java
@@ -0,0 +1,111 @@
+/*
+ * 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.coap;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+
+import javax.net.ssl.SSLContext;
+
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.model.rest.RestConfigurationDefinition;
+import org.apache.camel.util.jsse.KeyManagersParameters;
+import org.apache.camel.util.jsse.KeyStoreParameters;
+import org.apache.camel.util.jsse.SSLContextParameters;
+import org.apache.camel.util.jsse.TrustManagersParameters;
+import org.eclipse.californium.core.CoapClient;
+import org.eclipse.californium.core.network.CoapEndpoint;
+import org.eclipse.californium.core.network.config.NetworkConfig;
+import org.eclipse.californium.elements.tcp.TcpClientConnector;
+import org.eclipse.californium.elements.tcp.TlsClientConnector;
+
+/**
+ * Test the CoAP Rest Component with TCP + TLS
+ */
+public class CoAPRestComponentTCPTLSTest extends CoAPRestComponentTestBase {
+
+@Override
+protected String getProtocol() {
+return "coaps+tcp";
+}
+
+@Override
+protected void decorateClient(CoapClient client) throws
GeneralSecurityException, IOException {
+
+NetworkConfig config = NetworkConfig.createStandardWithoutFile();
+int tcpThreads = config.getInt(NetworkConfig.Keys.TCP_WORKER_THREADS);
+int tcpConnectTimeout =
config.getInt(NetworkConfig.Keys.TCP_CONNECT_TIMEOUT);
+int tcpIdleTimeout =
config.getInt(NetworkConfig.Keys.TCP_CONNECTION_IDLE_TIMEOUT);
+
+KeyStoreParameters truststoreParameters = new KeyStoreParameters();
+truststoreParameters.setResource("truststore.jks");
+truststoreParameters.setPassword("storepass");
+
+SSLContextParameters clientSSLContextParameters = new
SSLContextParameters();
+TrustManagersParameters clientSSLTrustManagers = new
TrustManagersParameters();
+clientSSLTrustManagers.setKeyStore(truststoreParameters);
+clientSSLContextParameters.setTrustManagers(clientSSLTrustManagers);
+
+SSLContext sslContext =
clientSSLContextParameters.createSSLContext(context);
+TcpClientConnector tcpConnector = new TlsClientConnector(sslContext,
tcpThreads, tcpConnectTimeout, tcpIdleTimeout);
+
+CoapEndpoint.Builder tcpBuilder = new CoapEndpoint.Builder();
+tcpBuilder.setConnector(tcpConnector);
+
+client.setEndpoint(tcpBuilder.build());
+}
+
+@Override
+protected JndiRegistry createRegistry() throws Exception {
+JndiRegistry registry = super.createRegistry();
+
+KeyStoreParameters keystoreParameters = new KeyStoreParameters();
+keystoreParameters.setResource("service.jks");
+keystoreParameters.setPassword("security");
+
+SSLContextParameters serviceSSLContextParameters = new
SSLContextParameters();
+KeyManagersParameters serviceSSLKeyManagers = new
KeyManagersParameters();
+serviceSSLKeyManagers.setKeyPassword("security");
+
[camel] 01/07: CAMEL-13471 - Adding support for coap+tcp
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 44343e853c010b15ba8d382b4f5762539d4695a1
Author: Colm O hEigeartaigh
AuthorDate: Tue Apr 30 14:55:26 2019 +0100
CAMEL-13471 - Adding support for coap+tcp
---
components/camel-coap/pom.xml | 5 +
.../java/org/apache/camel/coap/CoAPComponent.java | 8 +-
.../java/org/apache/camel/coap/CoAPEndpoint.java | 6 +-
.../java/org/apache/camel/coap/CoAPProducer.java | 14 ++-
.../services/org/apache/camel/component/coap+tcp | 18 +++
.../services/org/apache/camel/component/coaps+tcp | 18 +++
.../org/apache/camel/coap/CoAPComponentTest.java | 28 -
.../camel/coap/CoAPRestComponentTCPTest.java | 131 +
.../springboot/CoAPComponentAutoConfiguration.java | 3 +-
9 files changed, 226 insertions(+), 5 deletions(-)
diff --git a/components/camel-coap/pom.xml b/components/camel-coap/pom.xml
index 11ebeba..30af0a5 100644
--- a/components/camel-coap/pom.xml
+++ b/components/camel-coap/pom.xml
@@ -52,6 +52,11 @@
scandium
${californium-version}
+
+ org.eclipse.californium
+ element-connector-tcp
+ ${californium-version}
+
diff --git
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
index e0dc8c6..2aebf3e 100644
---
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
+++
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
@@ -36,6 +36,7 @@ import org.apache.camel.util.URISupport;
import org.eclipse.californium.core.CoapServer;
import org.eclipse.californium.core.network.CoapEndpoint;
import org.eclipse.californium.core.network.config.NetworkConfig;
+import org.eclipse.californium.elements.tcp.TcpServerConnector;
import org.eclipse.californium.scandium.DTLSConnector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,10 +69,15 @@ public class CoAPComponent extends UriEndpointComponent
implements RestConsumerF
InetSocketAddress address = new InetSocketAddress(port);
coapBuilder.setNetworkConfig(config);
-// Configure TLS
+// Configure TLS and / or TCP
if (CoAPEndpoint.enableTLS(endpoint.getUri())) {
DTLSConnector connector =
endpoint.createDTLSConnector(address, false);
coapBuilder.setConnector(connector);
+} else if (CoAPEndpoint.enableTCP(endpoint.getUri())) {
+int tcpThreads =
config.getInt(NetworkConfig.Keys.TCP_WORKER_THREADS);
+int tcpIdleTimeout =
config.getInt(NetworkConfig.Keys.TCP_CONNECTION_IDLE_TIMEOUT);
+TcpServerConnector tcpConnector = new
TcpServerConnector(address, tcpThreads, tcpIdleTimeout);
+coapBuilder.setConnector(tcpConnector);
} else {
coapBuilder.setInetSocketAddress(address);
}
diff --git
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
index 6d5e32c..cdcc734 100644
---
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
+++
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
@@ -49,7 +49,7 @@ import
org.eclipse.californium.scandium.dtls.rpkstore.TrustedRpkStore;
/**
* The coap component is used for sending and receiving messages from COAP
capable devices.
*/
-@UriEndpoint(firstVersion = "2.16.0", scheme = "coap", title = "CoAP", syntax
= "coap:uri", consumerClass = CoAPConsumer.class, label = "iot")
+@UriEndpoint(firstVersion = "2.16.0", scheme =
"coap,coaps,coap+tcp,coaps+tcp", title = "CoAP", syntax = "coap:uri",
consumerClass = CoAPConsumer.class, label = "iot")
public class CoAPEndpoint extends DefaultEndpoint {
@UriPath
private URI uri;
@@ -360,6 +360,10 @@ public class CoAPEndpoint extends DefaultEndpoint {
return "coaps".equals(uri.getScheme());
}
+public static boolean enableTCP(URI uri) {
+return uri.getScheme().endsWith("+tcp");
+}
+
public DTLSConnector createDTLSConnector(InetSocketAddress address,
boolean client) {
DtlsConnectorConfig.Builder builder = new
DtlsConnectorConfig.Builder();
diff --git
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java
index 71766df..0f50f03 100644
---
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java
+++
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java
@@ -25,6 +25,8 @@ import org.eclipse.californium.core.CoapClient;
import
[camel] 07/07: CAMEL-13471 - Adding more tests
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cf7186d874546d18b1c06b1c04542561f9884156
Author: Colm O hEigeartaigh
AuthorDate: Tue May 7 17:00:06 2019 +0100
CAMEL-13471 - Adding more tests
---
.../java/org/apache/camel/coap/CoAPComponent.java | 2 +-
.../java/org/apache/camel/coap/CoAPEndpoint.java | 2 +-
.../java/org/apache/camel/coap/CoAPProducer.java | 2 +-
.../apache/camel/coap/CoAPComponentTCPTLSTest.java | 39 ++
.../apache/camel/coap/CoAPComponentTLSTest.java| 404 +
...tTLSTest.java => CoAPComponentTLSTestBase.java} | 217 +--
6 files changed, 166 insertions(+), 500 deletions(-)
diff --git
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
index 65ae1d4..a732a89 100644
---
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
+++
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
@@ -75,7 +75,7 @@ public class CoAPComponent extends UriEndpointComponent
implements RestConsumerF
coapBuilder.setNetworkConfig(config);
// Configure TLS and / or TCP
-if (CoAPEndpoint.enableTLS(endpoint.getUri())) {
+if (CoAPEndpoint.enableDTLS(endpoint.getUri())) {
DTLSConnector connector =
endpoint.createDTLSConnector(address, false);
coapBuilder.setConnector(connector);
} else if (CoAPEndpoint.enableTCP(endpoint.getUri())) {
diff --git
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
index a86c77e..65ba27e 100644
---
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
+++
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
@@ -316,7 +316,7 @@ public class CoAPEndpoint extends DefaultEndpoint {
}
-public static boolean enableTLS(URI uri) {
+public static boolean enableDTLS(URI uri) {
return "coaps".equals(uri.getScheme());
}
diff --git
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java
index 866c684..81f662b 100644
---
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java
+++
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java
@@ -102,7 +102,7 @@ public class CoAPProducer extends DefaultProducer {
client = new CoapClient(uri);
// Configure TLS and / or TCP
-if (CoAPEndpoint.enableTLS(uri)) {
+if (CoAPEndpoint.enableDTLS(uri)) {
DTLSConnector connector = endpoint.createDTLSConnector(null,
true);
CoapEndpoint.Builder coapBuilder = new CoapEndpoint.Builder();
coapBuilder.setConnector(connector);
diff --git
a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTCPTLSTest.java
b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTCPTLSTest.java
new file mode 100644
index 000..8582613
--- /dev/null
+++
b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTCPTLSTest.java
@@ -0,0 +1,39 @@
+/*
+ * 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.coap;
+
+/**
+ * TCP + TLS tests
+ */
+public class CoAPComponentTCPTLSTest extends CoAPComponentTLSTestBase {
+
+@Override
+protected String getProtocol() {
+return "coaps+tcp";
+}
+
+@Override
+protected boolean isPSKSupported() {
+return false;
+}
+
+@Override
+protected boolean isRPKSupported() {
+return false;
+}
+
+}
diff --git
a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTest.java
b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTest.java
index 11aa4a5..1601506 100644
---
[camel] 05/07: CAMEL-13471 - Updating docs
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git commit 8901eeadb19983384066cd4632645de61a31d3e0 Author: Colm O hEigeartaigh AuthorDate: Tue May 7 16:39:03 2019 +0100 CAMEL-13471 - Updating docs --- components/camel-coap/src/main/docs/coap-component.adoc | 17 + 1 file changed, 17 insertions(+) diff --git a/components/camel-coap/src/main/docs/coap-component.adoc b/components/camel-coap/src/main/docs/coap-component.adoc index e3c7c6b..7e700ec 100644 --- a/components/camel-coap/src/main/docs/coap-component.adoc +++ b/components/camel-coap/src/main/docs/coap-component.adoc @@ -8,6 +8,23 @@ allows you to work with CoAP, a lightweight REST-type protocol for machine-to-ma http://coap.technology/[CoAP], Constrained Application Protocol is a specialized web transfer protocol for use with constrained nodes and constrained networks and it is based on RFC 7252. +From Camel 3.0.0, Camel supports the DTLS, TCP and TLS protocols via the following URI schemes: + +[width="100%",cols="2,5",options="header"] +|=== +| Scheme | Protocol | +| coap | UDP | +| coaps | UDP + DTLS | +| coap+tcp | TCP | +| coaps+tcp | TCP + TLS | +|=== + +There are a number of different configuration options to configure TLS. For both DTLS (the "coaps" uri scheme) +and TCP + TLS (the "coaps+tcp" uri scheme), it is possible to use a "sslContextParameters" parameter, from +which the camel-coap component will extract the required truststore / keystores etc to set up TLS. In addition, +the DTLS protocol supports two alternative configuration mechanisms. To use a pre-shared key, configure a +pskStore, and to work with raw public keys, configure privateKey + publicKey objects. + Maven users will need to add the following dependency to their pom.xml for this component:
[camel] 03/07: CAMEL-13471 - Added TLS + TCP support
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8239d22b7e91671bf61f97547712b8c53bbe1c97
Author: Colm O hEigeartaigh
AuthorDate: Fri May 3 10:21:54 2019 +0100
CAMEL-13471 - Added TLS + TCP support
---
.../java/org/apache/camel/coap/CoAPComponent.java | 25 --
.../java/org/apache/camel/coap/CoAPEndpoint.java | 6 +++---
.../java/org/apache/camel/coap/CoAPProducer.java | 17 +--
.../apache/camel/coap/CoAPComponentTLSTest.java| 21 ++
4 files changed, 62 insertions(+), 7 deletions(-)
diff --git
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
index b77d5ba..65ae1d4 100644
---
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
+++
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
@@ -18,11 +18,14 @@ package org.apache.camel.coap;
import java.io.IOException;
import java.net.InetSocketAddress;
+import java.security.GeneralSecurityException;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import javax.net.ssl.SSLContext;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
@@ -38,6 +41,7 @@ import org.eclipse.californium.core.CoapServer;
import org.eclipse.californium.core.network.CoapEndpoint;
import org.eclipse.californium.core.network.config.NetworkConfig;
import org.eclipse.californium.elements.tcp.TcpServerConnector;
+import org.eclipse.californium.elements.tcp.TlsServerConnector;
import org.eclipse.californium.scandium.DTLSConnector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,7 +63,7 @@ public class CoAPComponent extends UriEndpointComponent
implements RestConsumerF
super(context, CoAPEndpoint.class);
}
-public synchronized CoapServer getServer(int port, CoAPEndpoint endpoint)
throws IOException {
+public synchronized CoapServer getServer(int port, CoAPEndpoint endpoint)
throws IOException, GeneralSecurityException {
CoapServer server = servers.get(port);
if (server == null && port == -1) {
server = getServer(DEFAULT_PORT, endpoint);
@@ -77,7 +81,24 @@ public class CoAPComponent extends UriEndpointComponent
implements RestConsumerF
} else if (CoAPEndpoint.enableTCP(endpoint.getUri())) {
int tcpThreads =
config.getInt(NetworkConfig.Keys.TCP_WORKER_THREADS);
int tcpIdleTimeout =
config.getInt(NetworkConfig.Keys.TCP_CONNECTION_IDLE_TIMEOUT);
-TcpServerConnector tcpConnector = new
TcpServerConnector(address, tcpThreads, tcpIdleTimeout);
+
+TcpServerConnector tcpConnector = null;
+// TLS + TCP
+if (endpoint.getUri().getScheme().startsWith("coaps")) {
+int tlsHandshakeTimeout =
config.getInt(NetworkConfig.Keys.TLS_HANDSHAKE_TIMEOUT);
+
+SSLContext sslContext =
endpoint.getSslContextParameters().createSSLContext(getCamelContext());
+TlsServerConnector.ClientAuthMode clientAuthMode =
TlsServerConnector.ClientAuthMode.NONE;
+if (endpoint.isClientAuthenticationRequired()) {
+clientAuthMode =
TlsServerConnector.ClientAuthMode.NEEDED;
+} else if (endpoint.isClientAuthenticationWanted()) {
+clientAuthMode =
TlsServerConnector.ClientAuthMode.WANTED;
+}
+tcpConnector =
+new TlsServerConnector(sslContext, clientAuthMode,
address, tcpThreads, tlsHandshakeTimeout, tcpIdleTimeout);
+} else {
+tcpConnector = new TcpServerConnector(address, tcpThreads,
tcpIdleTimeout);
+}
coapBuilder.setConnector(tcpConnector);
} else {
coapBuilder.setInetSocketAddress(address);
diff --git
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
index 02ac6da..a86c77e 100644
---
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
+++
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
@@ -131,7 +131,7 @@ public class CoAPEndpoint extends DefaultEndpoint {
return uri;
}
-public CoapServer getCoapServer() throws IOException {
+public CoapServer getCoapServer() throws IOException,
GeneralSecurityException {
return component.getServer(getUri().getPort(), this);
}
@@ -275,7 +275,7 @@ public class CoAPEndpoint extends DefaultEndpoint {
[camel] 06/07: Fixing table columns
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git commit 17e7ff689936b11fab944a540e3fc0aa99e18523 Author: Colm O hEigeartaigh AuthorDate: Tue May 7 16:41:48 2019 +0100 Fixing table columns --- components/camel-coap/src/main/docs/coap-component.adoc | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/camel-coap/src/main/docs/coap-component.adoc b/components/camel-coap/src/main/docs/coap-component.adoc index 7e700ec..3058ce1 100644 --- a/components/camel-coap/src/main/docs/coap-component.adoc +++ b/components/camel-coap/src/main/docs/coap-component.adoc @@ -12,11 +12,11 @@ From Camel 3.0.0, Camel supports the DTLS, TCP and TLS protocols via the followi [width="100%",cols="2,5",options="header"] |=== -| Scheme | Protocol | -| coap | UDP | -| coaps | UDP + DTLS | -| coap+tcp | TCP | -| coaps+tcp | TCP + TLS | +| Scheme | Protocol +| coap | UDP +| coaps | UDP + DTLS +| coap+tcp | TCP +| coaps+tcp | TCP + TLS |=== There are a number of different configuration options to configure TLS. For both DTLS (the "coaps" uri scheme)
[camel] branch master updated: CAMEL-13582: Camel main - Configuration class should support automatic autowire by type. Made CamelBeanPostProcessor sort the @BindToRegistry methods in a better order s
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 511a773 CAMEL-13582: Camel main - Configuration class should support
automatic autowire by type. Made CamelBeanPostProcessor sort the
@BindToRegistry methods in a better order so they deal with inter dependencies
among themselves.
511a773 is described below
commit 511a7730ba4d2a9c27d0d27bb5bd815653d2898b
Author: Claus Ibsen
AuthorDate: Mon May 27 12:28:03 2019 +0200
CAMEL-13582: Camel main - Configuration class should support automatic
autowire by type. Made CamelBeanPostProcessor sort the @BindToRegistry methods
in a better order so they deal with inter dependencies among themselves.
---
.../impl/engine/DefaultCamelBeanPostProcessor.java | 28 +-
.../main/MainIoCNewRouteBuilderComplexTest.java| 102 +
2 files changed, 129 insertions(+), 1 deletion(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
index cab3f8b..6899089 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
@@ -247,6 +247,32 @@ public class DefaultCamelBeanPostProcessor implements
CamelBeanPostProcessor {
// sort methods on shortest number of parameters as we want to process
the most simplest first
methods.sort(Comparator.comparingInt(Method::getParameterCount));
+// then do a more complex sorting where we check inter-dependency
among the methods
+methods.sort((m1, m2) -> {
+Class[] types1 = m1.getParameterTypes();
+Class[] types2 = m2.getParameterTypes();
+
+// favour methods that has no parameters
+if (types1.length == 0 && types2.length == 0) {
+return 0;
+} else if (types1.length == 0) {
+return -1;
+} else if (types2.length == 0) {
+return 1;
+}
+
+// okay then compare so we favour methods that does not use
parameter types that are returned from other methods
+boolean usedByOthers1 = false;
+for (Class clazz : types1) {
+usedByOthers1 |= methods.stream().anyMatch(m ->
m.getParameterCount() > 0 && clazz.isAssignableFrom(m.getReturnType()));
+}
+boolean usedByOthers2 = false;
+for (Class clazz : types2) {
+usedByOthers2 |= methods.stream().anyMatch(m ->
m.getParameterCount() > 0 && clazz.isAssignableFrom(m.getReturnType()));
+}
+return Boolean.compare(usedByOthers1, usedByOthers2);
+});
+
LOG.trace("Discovered {} @BindToRegistry methods", methods.size());
// bind each method
@@ -442,7 +468,7 @@ public class DefaultCamelBeanPostProcessor implements
CamelBeanPostProcessor {
Set instances =
camelContext.getRegistry().findByType(type);
if (instances.size() == 1) {
parameters[i] = instances.iterator().next();
-} else {
+} else if (instances.size() > 1) {
// there are multiple instances of the same type, so
barf
throw new IllegalArgumentException("Multiple beans of
the same type: " + type
+ " exists in the Camel registry. Specify the
bean name on @BeanInject to bind to a single bean, at the method: " + method);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
b/core/camel-core/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
new file mode 100644
index 000..01a90db
--- /dev/null
+++
b/core/camel-core/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
@@ -0,0 +1,102 @@
+/*
+ * 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
[camel-website] branch asf-site updated: Website updated to ce8ece9
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 955d432 Website updated to ce8ece9
955d432 is described below
commit 955d43205d8d92fbee86d75decb3d1d76bf685a1
Author: jenkins
AuthorDate: Mon May 27 10:26:20 2019 +
Website updated to ce8ece9
---
components/latest/ahc-component.html | 4 +-
components/latest/ahc-ws-component.html | 2 +-
components/latest/amqp-component.html| 2 +-
components/latest/aws-sns-component.html | 6 +-
sitemap-camel-k.xml | 42 +-
sitemap-components.xml | 746 +++
sitemap-manual.xml | 402 -
7 files changed, 602 insertions(+), 602 deletions(-)
diff --git a/components/latest/ahc-component.html
b/components/latest/ahc-component.html
index 522c463..92de79f 100644
--- a/components/latest/ahc-component.html
+++ b/components/latest/ahc-component.html
@@ -1,10 +1,10 @@
-Untitled ::
Apache Camelhttps://camel.apache.org/staging/components/latest/ahc-component.html;>Untitled ::
Apache Camelhttps://camel.apache.org/staging/components/latest/ahc-component.html;>URI formatahc:http://hostname[:port][/resourceUri][?options]
-ahc:https://hostname[:port][/resourceUri][?options]Will by default use port 80 for HTTP and 443 for
HTTPS.You can append query options to the
URI in the following
format,?option=valueoption=valueAhcEndpoint OptionsThe AHC [...]
+ahc:https://hostname[:port][/resourceUri][?options]Will by default use port 80 for HTTP and 443 for
HTTPS.You can append query options to the
URI in the following
format,?option=valueoption=valueAhc Endpoint OptionsThe [...]
groupIdorg.apache.camel/groupId
artifactIdcamel-ahc-starter/artifactId
versionx.x.x/version
diff --git a/components/latest/ahc-ws-component.html
b/components/latest/ahc-ws-component.html
index d041ae1..aca58c4 100644
--- a/components/latest/ahc-ws-component.html
+++ b/components/latest/ahc-ws-component.html
@@ -1,4 +1,4 @@
-Untitled ::
Apache Camelhttps://camel.apache.org/staging/components/latest/ahc-ws-component.html;>Untitled ::
Apache Camelhttps://camel.apache.org/staging/components/latest/ahc-ws-component.html;>Untitled ::
Apache Camelhttps://camel.apache.org/staging/components/latest/amqp-component.html;>Untitled ::
Apache Camelhttps://camel.apache.org/staging/components/latest/amqp-component.html;>Untitled ::
Apache Camelhttps://camel.apache.org/staging/components/latest/aws-sns-component.html;>Untitled ::
Apache Camelhttps://camel.apache.org/staging/components/latest/aws-sns-component.html;>The
component supports 22 options, which are listed below.NameDescriptionDefa [...]
+/dependencyThe
component supports 23 options, which are listed below.NameDescriptionDefa [...]
.to("aws-sns://MyTopic?amazonSNSClient=#client");The#clientrefers to aAmazonSNSin
the Registry.For example if your Camel
Application is running behind a firewall:AWSCredentials
awsCredentials = new BasicAWSCredentials("myAccessKey", "myS [...]
ClientConfiguration clientConfiguration = new ClientConfiguration();
clientConfiguration.setProxyHost("http://myProxyHost;);
@@ -12,7 +12,7 @@ AmazonSNS client = new AmazonSNSClient(awsCredentials,
clientConfiguration);
registry.bind("client", client);Create
a subscription between an AWS SNS Topic and an AWS SQS QueueYou can create a subscription of an SQS Queue to an SNS
Topic in this way:https://sqs.eu-central-1.amazonaws.com/780410022472/test-camel;);The#amazonSNSClientrefers to
aAmazonSNSin the Registry, while
the#amazonSQSClientrefers to anAmazonSQSclient. By
specifyingsubscribeSNStoSQSto true and aqueueUrlAutomatic
detection of AmazonSNS client in registryFrom
Camel 3.0.0-M3 the component will be able to detect the presence of an
AmazonSNS bean into the registry. If its the only instance of that type
it will be used as client and you won [...]
+.to(...);Topic AutocreationWith the optionautoCreateTopicusers are able
to avoid the autocreation of an SNS Topic in case it doesnt exist. The
default for this option istrue. If set to false any operation on a
not-existent topic in AWS wont be successful and an error will be return
[...]
groupIdorg.apache.camel/groupId
artifactIdcamel-aws-sns/artifactId
version${camel-version}/version
diff --git a/sitemap-camel-k.xml b/sitemap-camel-k.xml
index 662547a..16ce2aa 100644
--- a/sitemap-camel-k.xml
+++ b/sitemap-camel-k.xml
@@ -2,86 +2,86 @@
http://www.sitemaps.org/schemas/sitemap/0.9;>
https://camel.apache.org/staging/camel-k/latest/configuration/components.html
-2019-05-27T07:33:51.813Z
+2019-05-27T10:25:25.935Z
https://camel.apache.org/staging/camel-k/latest/configuration/configmap-secret.html
-2019-05-27T07:33:51.813Z
+2019-05-27T10:25:25.935Z
[camel] branch master updated (2524e7a -> ce62860)
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 2524e7a CAMEL-13583: Camel Injector should have method for creating new instance without bean post processing which is not needed when loading internal Camel factory classes and the likes. This makes Camel startup faster and reduces the overhead of post processing/scanning classes/methods etc. new 9215a33 Camel-amqp: Fixed spacing in the docs new ce62860 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: components/camel-amqp/src/main/docs/amqp-component.adoc | 8 +--- docs/components/modules/ROOT/pages/amqp-component.adoc | 8 +--- 2 files changed, 10 insertions(+), 6 deletions(-)
[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 ce628603c66c10477380e8bac47d9a4c60a3bad4 Author: Andrea Cosentino AuthorDate: Mon May 27 12:18:36 2019 +0200 Regen docs --- docs/components/modules/ROOT/pages/amqp-component.adoc | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/components/modules/ROOT/pages/amqp-component.adoc b/docs/components/modules/ROOT/pages/amqp-component.adoc index 38b2afb..9b39743 100644 --- a/docs/components/modules/ROOT/pages/amqp-component.adoc +++ b/docs/components/modules/ROOT/pages/amqp-component.adoc @@ -3,10 +3,12 @@ *Available as of Camel version 1.2* -The *amqp:* component supports the http://www.amqp.org/[AMQP 1.0 -protocol] using the JMS Client API of the http://qpid.apache.org/[Qpid] +The amqp: component supports the +http://www.amqp.org/[AMQP 1.0 protocol] +using the JMS Client API of the http://qpid.apache.org/[Qpid] project. In case you want to use AMQP 0.9 (in particular RabbitMQ) you -might also be interested in the <> +might also be interested in the +<> component. Please keep in mind that prior to the Camel 2.17.0 AMQP component supported AMQP 0.9 and above, however since Camel 2.17.0 it supports only AMQP 1.0.
[camel] 01/02: Camel-amqp: Fixed spacing in the 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 9215a333520ca3e467043649522277bff8a3c7fc Author: Andrea Cosentino AuthorDate: Mon May 27 12:17:36 2019 +0200 Camel-amqp: Fixed spacing in the docs --- components/camel-amqp/src/main/docs/amqp-component.adoc | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc b/components/camel-amqp/src/main/docs/amqp-component.adoc index 38b2afb..9b39743 100644 --- a/components/camel-amqp/src/main/docs/amqp-component.adoc +++ b/components/camel-amqp/src/main/docs/amqp-component.adoc @@ -3,10 +3,12 @@ *Available as of Camel version 1.2* -The *amqp:* component supports the http://www.amqp.org/[AMQP 1.0 -protocol] using the JMS Client API of the http://qpid.apache.org/[Qpid] +The amqp: component supports the +http://www.amqp.org/[AMQP 1.0 protocol] +using the JMS Client API of the http://qpid.apache.org/[Qpid] project. In case you want to use AMQP 0.9 (in particular RabbitMQ) you -might also be interested in the <> +might also be interested in the +<> component. Please keep in mind that prior to the Camel 2.17.0 AMQP component supported AMQP 0.9 and above, however since Camel 2.17.0 it supports only AMQP 1.0.
[camel] 01/02: CAMEL-13582: Camel Main - @BindToRegistry are processed earlier and for methods then process them in order where the most basic methods are executed first.
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
commit 703b3851ad39d6fddf7fe394e9afca965e427907
Author: Claus Ibsen
AuthorDate: Mon May 27 10:36:09 2019 +0200
CAMEL-13582: Camel Main - @BindToRegistry are processed earlier and for
methods then process them in order where the most basic methods are executed
first.
---
.../impl/engine/DefaultCamelBeanPostProcessor.java | 49 +++---
1 file changed, 44 insertions(+), 5 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
index 0e7003b..cab3f8b 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
@@ -19,6 +19,9 @@ package org.apache.camel.impl.engine;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
import java.util.Set;
import org.apache.camel.BeanInject;
@@ -81,6 +84,8 @@ public class DefaultCamelBeanPostProcessor implements
CamelBeanPostProcessor {
injectClass(bean, beanName);
injectNestedClasses(bean, beanName);
+injectBindToRegistryFields(bean, beanName);
+injectBindToRegistryMethods(bean, beanName);
injectFields(bean, beanName);
injectMethods(bean, beanName);
@@ -181,7 +186,13 @@ public class DefaultCamelBeanPostProcessor implements
CamelBeanPostProcessor {
String uri = produce.value().isEmpty() ? produce.uri() :
produce.value();
injectField(field, uri, produce.property(), bean,
beanName, produce.binding());
}
+}
+});
+}
+protected void injectBindToRegistryFields(final Object bean, final String
beanName) {
+ReflectionHelper.doWithFields(bean.getClass(), new
ReflectionHelper.FieldCallback() {
+public void doWith(Field field) throws IllegalArgumentException,
IllegalAccessException {
BindToRegistry bind =
field.getAnnotation(BindToRegistry.class);
if (bind != null &&
getPostProcessorHelper().matchContext(bind.context())) {
bindToRegistry(field, bind.value(), bean, beanName);
@@ -222,6 +233,29 @@ public class DefaultCamelBeanPostProcessor implements
CamelBeanPostProcessor {
});
}
+protected void injectBindToRegistryMethods(final Object bean, final String
beanName) {
+// sort the methods so the simplest are used first
+
+final List methods = new ArrayList();
+ReflectionHelper.doWithMethods(bean.getClass(), method -> {
+BindToRegistry bind = method.getAnnotation(BindToRegistry.class);
+if (bind != null &&
getPostProcessorHelper().matchContext(bind.context())) {
+methods.add(method);
+}
+});
+
+// sort methods on shortest number of parameters as we want to process
the most simplest first
+methods.sort(Comparator.comparingInt(Method::getParameterCount));
+
+LOG.trace("Discovered {} @BindToRegistry methods", methods.size());
+
+// bind each method
+methods.forEach(method -> {
+BindToRegistry bind = method.getAnnotation(BindToRegistry.class);
+bindToRegistry(method, bind.value(), bean, beanName);
+});
+}
+
protected void injectClass(final Object bean, final String beanName) {
Class clazz = bean.getClass();
BindToRegistry ann = clazz.getAnnotation(BindToRegistry.class);
@@ -264,11 +298,6 @@ public class DefaultCamelBeanPostProcessor implements
CamelBeanPostProcessor {
String uri = produce.value().isEmpty() ? produce.uri() :
produce.value();
setterInjection(method, bean, beanName, uri, produce.property());
}
-
-BindToRegistry bind = method.getAnnotation(BindToRegistry.class);
-if (bind != null &&
getPostProcessorHelper().matchContext(bind.context())) {
-bindToRegistry(method, bind.value(), bean, beanName);
-}
}
public void setterInjection(Method method, Object bean, String beanName,
String endpointUri, String endpointProperty) {
@@ -408,6 +437,16 @@ public class DefaultCamelBeanPostProcessor implements
CamelBeanPostProcessor {
parameters[i] =
camelContext.getTypeConverter().convertTo(type, value);
}
}
+} else {
+// okay attempt to default to singleton instances from the
registry
+Set instances =
[camel] 02/02: CAMEL-13583: Camel Injector should have method for creating new instance without bean post processing which is not needed when loading internal Camel factory classes and the likes. This
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
commit 2524e7a044cf9747e9583f3f448c9b0dedfc83a4
Author: Claus Ibsen
AuthorDate: Mon May 27 11:15:27 2019 +0200
CAMEL-13583: Camel Injector should have method for creating new instance
without bean post processing which is not needed when loading internal Camel
factory classes and the likes. This makes Camel startup faster and reduces the
overhead of post processing/scanning classes/methods etc.
---
.../main/java/org/apache/camel/cdi/CdiCamelInjector.java | 7 ++-
.../org/apache/camel/component/jcr/JcrConverterTest.java | 5 +
.../java/org/apache/camel/spring/spi/SpringInjector.java | 12 +++-
.../src/main/java/org/apache/camel/spi/Injector.java | 14 --
.../camel/impl/converter/BaseTypeConverterRegistry.java| 2 +-
.../camel/impl/engine/BeanProcessorFactoryResolver.java| 2 +-
.../apache/camel/impl/engine/BeanProxyFactoryResolver.java | 2 +-
.../apache/camel/impl/engine/DefaultComponentResolver.java | 2 +-
.../camel/impl/engine/DefaultDataFormatResolver.java | 2 +-
.../org/apache/camel/impl/engine/DefaultFactoryFinder.java | 2 +-
.../java/org/apache/camel/impl/engine/DefaultInjector.java | 9 +++--
.../apache/camel/impl/engine/DefaultLanguageResolver.java | 4 ++--
.../camel/impl/engine/HeadersMapFactoryResolver.java | 2 +-
.../camel/impl/engine/RestRegistryFactoryResolver.java | 2 +-
.../apache/camel/processor/SendDynamicAwareResolver.java | 2 +-
.../camel/impl/cloud/ServiceCallProcessorFactory.java | 2 +-
.../java/org/apache/camel/core/osgi/impl/Activator.java| 4 ++--
.../core/xml/AbstractCamelContextFactoryBeanTest.java | 6 ++
.../src/main/java/org/apache/camel/model/ModelHelper.java | 2 +-
.../model/cloud/ServiceCallExpressionConfiguration.java| 2 +-
.../cloud/ServiceCallServiceChooserConfiguration.java | 2 +-
.../cloud/ServiceCallServiceDiscoveryConfiguration.java| 2 +-
.../model/cloud/ServiceCallServiceFilterConfiguration.java | 2 +-
.../cloud/ServiceCallServiceLoadBalancerConfiguration.java | 2 +-
.../camel/reifier/loadbalancer/LoadBalancerReifier.java| 2 +-
.../camel/reifier/transformer/CustomTransformeReifier.java | 2 +-
.../camel/reifier/validator/CustomValidatorReifier.java| 2 +-
.../apache/camel/impl/engine/DefaultFactoryFinderTest.java | 4 ++--
.../java/org/apache/camel/util/ReflectionInjector.java | 9 -
29 files changed, 80 insertions(+), 32 deletions(-)
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java
index a4d8563..582b3ee 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java
@@ -35,8 +35,13 @@ final class CdiCamelInjector implements Injector {
@Override
public T newInstance(Class type) {
+return newInstance(type, true);
+}
+
+@Override
+public T newInstance(Class type, boolean postProcessBean) {
return getReferenceByType(manager, type)
-.orElseGet(() -> injector.newInstance(type));
+.orElseGet(() -> injector.newInstance(type, postProcessBean));
}
@Override
diff --git
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
index 8feee6b..ac1f35f 100644
---
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
+++
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
@@ -50,6 +50,11 @@ public class JcrConverterTest extends Assert {
new Injector() {
@Override
public T newInstance(Class type) {
+return newInstance(type, true);
+}
+
+@Override
+public T newInstance(Class type, boolean
postProcessBean) {
return ObjectHelper.newInstance(type);
}
diff --git
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java
index d7e4471..7d50435 100644
---
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java
+++
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java
@@ -33,7 +33,17 @@ public class SpringInjector implements Injector {
}
public T newInstance(Class type) {
-Object value = applicationContext.getBeanFactory().createBean(type,
[camel] branch master updated (1dcf9dc -> 2524e7a)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 1dcf9dc Regen new 703b385 CAMEL-13582: Camel Main - @BindToRegistry are processed earlier and for methods then process them in order where the most basic methods are executed first. new 2524e7a CAMEL-13583: Camel Injector should have method for creating new instance without bean post processing which is not needed when loading internal Camel factory classes and the likes. This makes Camel startup faster and reduces the overhead of post processing/scanning classes/methods etc. 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: .../org/apache/camel/cdi/CdiCamelInjector.java | 7 +++- .../camel/component/jcr/JcrConverterTest.java | 5 +++ .../apache/camel/spring/spi/SpringInjector.java| 12 +- .../main/java/org/apache/camel/spi/Injector.java | 14 ++- .../impl/converter/BaseTypeConverterRegistry.java | 2 +- .../impl/engine/BeanProcessorFactoryResolver.java | 2 +- .../impl/engine/BeanProxyFactoryResolver.java | 2 +- .../impl/engine/DefaultCamelBeanPostProcessor.java | 49 +++--- .../impl/engine/DefaultComponentResolver.java | 2 +- .../impl/engine/DefaultDataFormatResolver.java | 2 +- .../camel/impl/engine/DefaultFactoryFinder.java| 2 +- .../apache/camel/impl/engine/DefaultInjector.java | 9 +++- .../camel/impl/engine/DefaultLanguageResolver.java | 4 +- .../impl/engine/HeadersMapFactoryResolver.java | 2 +- .../impl/engine/RestRegistryFactoryResolver.java | 2 +- .../camel/processor/SendDynamicAwareResolver.java | 2 +- .../impl/cloud/ServiceCallProcessorFactory.java| 2 +- .../org/apache/camel/core/osgi/impl/Activator.java | 4 +- .../xml/AbstractCamelContextFactoryBeanTest.java | 6 +++ .../java/org/apache/camel/model/ModelHelper.java | 2 +- .../cloud/ServiceCallExpressionConfiguration.java | 2 +- .../ServiceCallServiceChooserConfiguration.java| 2 +- .../ServiceCallServiceDiscoveryConfiguration.java | 2 +- .../ServiceCallServiceFilterConfiguration.java | 2 +- ...erviceCallServiceLoadBalancerConfiguration.java | 2 +- .../reifier/loadbalancer/LoadBalancerReifier.java | 2 +- .../transformer/CustomTransformeReifier.java | 2 +- .../reifier/validator/CustomValidatorReifier.java | 2 +- .../impl/engine/DefaultFactoryFinderTest.java | 4 +- .../org/apache/camel/util/ReflectionInjector.java | 9 +++- 30 files changed, 124 insertions(+), 37 deletions(-)
[camel] branch master updated: 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 The following commit(s) were added to refs/heads/master by this push: new 1dcf9dc Regen 1dcf9dc is described below commit 1dcf9dce01e3b3237fb53ececb56c3628cbc194f Author: Andrea Cosentino AuthorDate: Mon May 27 11:26:33 2019 +0200 Regen --- components/camel-aws-sns/src/main/docs/aws-sns-component.adoc | 3 ++- docs/components/modules/ROOT/pages/ahc-component.adoc | 10 +- docs/components/modules/ROOT/pages/ahc-ws-component.adoc | 5 +++-- docs/components/modules/ROOT/pages/aws-sns-component.adoc | 11 +-- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc b/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc index 0127321..b8b295e 100644 --- a/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc +++ b/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc @@ -110,7 +110,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s -The component supports 22 options, which are listed below. +The component supports 23 options, which are listed below. @@ -122,6 +122,7 @@ The component supports 22 options, which are listed below. | *camel.component.aws-sns.configuration.access-key* | Amazon AWS Access Key | | String | *camel.component.aws-sns.configuration.amazon-s-n-s-client* | To use the AmazonSNS as the client | | AmazonSNS | *camel.component.aws-sns.configuration.amazon-s-q-s-client* | An SQS Client to use as bridge between SNS and SQS | | AmazonSQS +| *camel.component.aws-sns.configuration.auto-create-topic* | Setting the autocreation of the topic | true | Boolean | *camel.component.aws-sns.configuration.kms-master-key-id* | The ID of an AWS-managed customer master key (CMK) for Amazon SNS or a custom CMK. | | String | *camel.component.aws-sns.configuration.message-structure* | The message structure to use such as json | | String | *camel.component.aws-sns.configuration.policy* | The policy for this queue | | String diff --git a/docs/components/modules/ROOT/pages/ahc-component.adoc b/docs/components/modules/ROOT/pages/ahc-component.adoc index fd0ed79..9e647b2 100644 --- a/docs/components/modules/ROOT/pages/ahc-component.adoc +++ b/docs/components/modules/ROOT/pages/ahc-component.adoc @@ -3,11 +3,11 @@ *Available as of Camel version 2.8* -The *ahc:* component provides HTTP based endpoints +The ahc: component provides HTTP based endpoints for consuming external HTTP resources (as a client to call external -servers using HTTP). + - The component uses the -https://github.com/AsyncHttpClient/async-http-client[Async Http Client] +servers using HTTP). +The component uses the +https://github.com/AsyncHttpClient/async-http-client[Async Http Client] library. Maven users will need to add the following dependency to their `pom.xml` @@ -36,7 +36,7 @@ Will by default use port 80 for HTTP and 443 for HTTPS. You can append query options to the URI in the following format, `?option=value=value&...` -### AhcEndpoint Options +### Ahc Endpoint Options diff --git a/docs/components/modules/ROOT/pages/ahc-ws-component.adoc b/docs/components/modules/ROOT/pages/ahc-ws-component.adoc index d2a30d1..ad3f0cb 100644 --- a/docs/components/modules/ROOT/pages/ahc-ws-component.adoc +++ b/docs/components/modules/ROOT/pages/ahc-ws-component.adoc @@ -8,8 +8,9 @@ based endpoints for a client communicating with external servers over Websocket (as a client opening a websocket connection to an external server). + The component uses the <> component that in turn uses -the https://github.com/AsyncHttpClient/async-http-client[Async Http -Client] library. +the +https://github.com/AsyncHttpClient/async-http-client[Async Http Client] +library. Maven users will need to add the following dependency to their `pom.xml` for this component: diff --git a/docs/components/modules/ROOT/pages/aws-sns-component.adoc b/docs/components/modules/ROOT/pages/aws-sns-component.adoc index 62fa6ed..b8b295e 100644 --- a/docs/components/modules/ROOT/pages/aws-sns-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-sns-component.adoc @@ -68,7 +68,7 @@ with the following path and query parameters: |=== - Query Parameters (17 parameters): + Query Parameters (18 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -76,6 +76,7 @@ with the following path and query parameters: | Name | Description | Default | Type | *amazonSNSClient* (producer) | To use the AmazonSNS as the client | | AmazonSNS | *amazonSQSClient* (producer) | An SQS Client to use as bridge between SNS and SQS | | AmazonSQS +| *autoCreateTopic* (producer) | Setting the autocreation of the topic | true | boolean | *headerFilterStrategy* (producer) | To
[camel] 01/04: CAMEL-13571 - Camel AWS-SNS: Make the autocreation of the topic configurable
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 aeadd081e29c72c3ebf661b38543e0b0fe5b52c0
Author: Andrea Cosentino
AuthorDate: Mon May 27 10:07:07 2019 +0200
CAMEL-13571 - Camel AWS-SNS: Make the autocreation of the topic configurable
---
.../apache/camel/component/aws/sns/SnsConfiguration.java | 16 +++-
.../org/apache/camel/component/aws/sns/SnsEndpoint.java | 2 +-
.../component/aws/sns/SnsComponentConfigurationTest.java | 15 +++
3 files changed, 31 insertions(+), 2 deletions(-)
diff --git
a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java
b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java
index 0b2ac60..888a755 100644
---
a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java
+++
b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java
@@ -50,6 +50,8 @@ public class SnsConfiguration implements Cloneable {
private String kmsMasterKeyId;
@UriParam
private boolean serverSideEncryptionEnabled;
+@UriParam(defaultValue = "true")
+private boolean autoCreateTopic = true;
// Producer only properties
@UriParam
@@ -237,11 +239,23 @@ public class SnsConfiguration implements Cloneable {
this.serverSideEncryptionEnabled = serverSideEncryptionEnabled;
}
+
+public boolean isAutoCreateTopic() {
+ return autoCreateTopic;
+ }
+
+/**
+ * Setting the autocreation of the topic
+ */
+ public void setAutoCreateTopic(boolean autoCreateTopic) {
+ this.autoCreateTopic = autoCreateTopic;
+ }
+
// *
//
// *
-public SnsConfiguration copy() {
+ public SnsConfiguration copy() {
try {
return (SnsConfiguration)super.clone();
} catch (CloneNotSupportedException e) {
diff --git
a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
index de12b51..64636b4 100644
---
a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
+++
b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
@@ -121,7 +121,7 @@ public class SnsEndpoint extends DefaultEndpoint implements
HeaderFilterStrategy
}
}
-if (configuration.getTopicArn() == null) {
+if (configuration.getTopicArn() == null &&
configuration.isAutoCreateTopic()) {
// creates a new topic, or returns the URL of an existing one
CreateTopicRequest request = new
CreateTopicRequest(configuration.getTopicName());
diff --git
a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
index d255593..7619cc1 100644
---
a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
+++
b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
@@ -198,6 +198,21 @@ public class SnsComponentConfigurationTest extends
CamelTestSupport {
}
@Test
+public void createEndpointWithoutAutocreation() throws Exception {
+SnsComponent component = new SnsComponent(context);
+component.setAccessKey("XXX");
+component.setSecretKey("YYY");
+component.setRegion(Regions.US_WEST_1.toString());
+SnsEndpoint endpoint =
(SnsEndpoint)component.createEndpoint("aws-sns://MyTopic?accessKey=xx=y=US_EAST_1=false");
+
+assertEquals("MyTopic", endpoint.getConfiguration().getTopicName());
+assertEquals("xx", endpoint.getConfiguration().getAccessKey());
+assertEquals("y", endpoint.getConfiguration().getSecretKey());
+assertEquals("US_EAST_1", endpoint.getConfiguration().getRegion());
+assertEquals(false, endpoint.getConfiguration().isAutoCreateTopic());
+}
+
+@Test
public void createEndpointWithoutSecretKeyAndAccessKeyConfiguration()
throws Exception {
AmazonSNSClientMock mock = new AmazonSNSClientMock();
[camel] 02/04: CAMEL-13571 - 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 68c01f9e0b4631c0d12d5378a040004cd3d4f498
Author: Andrea Cosentino
AuthorDate: Mon May 27 10:07:51 2019 +0200
CAMEL-13571 - Regen docs
---
.../camel-aws-sns/src/main/docs/aws-sns-component.adoc | 3 ++-
.../aws/sns/springboot/SnsComponentConfiguration.java| 12
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
b/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
index 62fa6ed..8a4ef58 100644
--- a/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
+++ b/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
@@ -68,7 +68,7 @@ with the following path and query parameters:
|===
- Query Parameters (17 parameters):
+ Query Parameters (18 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -76,6 +76,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *amazonSNSClient* (producer) | To use the AmazonSNS as the client | |
AmazonSNS
| *amazonSQSClient* (producer) | An SQS Client to use as bridge between SNS
and SQS | | AmazonSQS
+| *autoCreateTopic* (producer) | Setting the autocreation of the topic | true
| boolean
| *headerFilterStrategy* (producer) | To use a custom HeaderFilterStrategy to
map headers to/from Camel. | | HeaderFilterStrategy
| *kmsMasterKeyId* (producer) | The ID of an AWS-managed customer master key
(CMK) for Amazon SNS or a custom CMK. | | String
| *messageStructure* (producer) | The message structure to use such as json |
| String
diff --git
a/platforms/spring-boot/components-starter/camel-aws-sns-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentConfiguration.java
b/platforms/spring-boot/components-starter/camel-aws-sns-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentConfiguration.java
index 893524d..5292cf2 100644
---
a/platforms/spring-boot/components-starter/camel-aws-sns-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-aws-sns-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentConfiguration.java
@@ -186,6 +186,10 @@ public class SnsComponentConfiguration
* Define if Server Side Encryption is enabled or not on the topic
*/
private Boolean serverSideEncryptionEnabled = false;
+/**
+ * Setting the autocreation of the topic
+ */
+private Boolean autoCreateTopic = true;
public String getSubject() {
return subject;
@@ -315,5 +319,13 @@ public class SnsComponentConfiguration
Boolean serverSideEncryptionEnabled) {
this.serverSideEncryptionEnabled = serverSideEncryptionEnabled;
}
+
+public Boolean getAutoCreateTopic() {
+return autoCreateTopic;
+}
+
+public void setAutoCreateTopic(Boolean autoCreateTopic) {
+this.autoCreateTopic = autoCreateTopic;
+}
}
}
\ No newline at end of file
[camel] 03/04: CAMEL-13571 - 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 7b6699c364da043ff0dae210182e135de8cca4ed
Author: Andrea Cosentino
AuthorDate: Mon May 27 10:09:09 2019 +0200
CAMEL-13571 - Fixed CS
---
.../camel/component/aws/sns/SnsConfiguration.java | 33 +++---
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git
a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java
b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java
index 888a755..7690de8 100644
---
a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java
+++
b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java
@@ -62,13 +62,14 @@ public class SnsConfiguration implements Cloneable {
private String messageStructure;
@UriParam
private String region;
-
+
public String getSubject() {
return subject;
}
/**
- * The subject which is used if the message header 'CamelAwsSnsSubject' is
not present.
+ * The subject which is used if the message header 'CamelAwsSnsSubject' is
+ * not present.
*/
public void setSubject(String subject) {
this.subject = subject;
@@ -128,7 +129,7 @@ public class SnsConfiguration implements Cloneable {
public void setTopicName(String topicName) {
this.topicName = topicName;
}
-
+
public String getPolicy() {
return policy;
}
@@ -150,7 +151,7 @@ public class SnsConfiguration implements Cloneable {
public void setMessageStructure(String messageStructure) {
this.messageStructure = messageStructure;
}
-
+
public String getProxyHost() {
return proxyHost;
}
@@ -172,7 +173,7 @@ public class SnsConfiguration implements Cloneable {
public void setProxyPort(Integer proxyPort) {
this.proxyPort = proxyPort;
}
-
+
public String getRegion() {
return region;
}
@@ -216,13 +217,14 @@ public class SnsConfiguration implements Cloneable {
public void setSubscribeSNStoSQS(boolean subscribeSNStoSQS) {
this.subscribeSNStoSQS = subscribeSNStoSQS;
}
-
+
public String getKmsMasterKeyId() {
return kmsMasterKeyId;
}
/**
- * The ID of an AWS-managed customer master key (CMK) for Amazon SNS or a
custom CMK.
+ * The ID of an AWS-managed customer master key (CMK) for Amazon SNS or a
+ * custom CMK.
*/
public void setKmsMasterKeyId(String kmsMasterKeyId) {
this.kmsMasterKeyId = kmsMasterKeyId;
@@ -238,28 +240,27 @@ public class SnsConfiguration implements Cloneable {
public void setServerSideEncryptionEnabled(boolean
serverSideEncryptionEnabled) {
this.serverSideEncryptionEnabled = serverSideEncryptionEnabled;
}
-
public boolean isAutoCreateTopic() {
- return autoCreateTopic;
- }
+return autoCreateTopic;
+}
/**
* Setting the autocreation of the topic
*/
- public void setAutoCreateTopic(boolean autoCreateTopic) {
- this.autoCreateTopic = autoCreateTopic;
- }
-
+public void setAutoCreateTopic(boolean autoCreateTopic) {
+this.autoCreateTopic = autoCreateTopic;
+}
+
// *
//
// *
- public SnsConfiguration copy() {
+public SnsConfiguration copy() {
try {
return (SnsConfiguration)super.clone();
} catch (CloneNotSupportedException e) {
throw new RuntimeCamelException(e);
}
}
-}
\ No newline at end of file
+}
[camel] branch master updated (d09a480 -> 358ebf8)
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 d09a480 Camel-ahc-ws: Spacing in the docs new aeadd08 CAMEL-13571 - Camel AWS-SNS: Make the autocreation of the topic configurable new 68c01f9 CAMEL-13571 - Regen docs new 7b6699c CAMEL-13571 - Fixed CS new 358ebf8 CAMEL-13571 - Docs The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/docs/aws-sns-component.adoc | 8 +- .../camel/component/aws/sns/SnsConfiguration.java | 33 -- .../camel/component/aws/sns/SnsEndpoint.java | 2 +- .../aws/sns/SnsComponentConfigurationTest.java | 15 ++ .../sns/springboot/SnsComponentConfiguration.java | 12 5 files changed, 59 insertions(+), 11 deletions(-)
[camel] 04/04: CAMEL-13571 - 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 358ebf8cfc0c8d9c3ea3ef24ef366b69127580e6
Author: Andrea Cosentino
AuthorDate: Mon May 27 10:10:47 2019 +0200
CAMEL-13571 - Docs
---
components/camel-aws-sns/src/main/docs/aws-sns-component.adoc | 5 +
1 file changed, 5 insertions(+)
diff --git a/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
b/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
index 8a4ef58..0127321 100644
--- a/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
+++ b/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
@@ -223,6 +223,11 @@
from("aws-sqs://test-camel?amazonSQSClient=#amazonSQSClient=50
.to(...);
-
+### Topic Autocreation
+
+With the option `autoCreateTopic` users are able to avoid the autocreation of
an SNS Topic in case it doesn't exist. The default for this option is `true`.
+If set to false any operation on a not-existent topic in AWS won't be
successful and an error will be returned.
+
### Automatic detection of AmazonSNS client in registry
From Camel 3.0.0-M3 the component will be able to detect the presence of an
AmazonSNS bean into the registry.
[camel] branch master updated: Camel-ahc-ws: Spacing in the 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 The following commit(s) were added to refs/heads/master by this push: new d09a480 Camel-ahc-ws: Spacing in the docs d09a480 is described below commit d09a4802ef50009eb308e9c3e89f517f0e65e19c Author: Andrea Cosentino AuthorDate: Mon May 27 09:53:58 2019 +0200 Camel-ahc-ws: Spacing in the docs --- components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc index d2a30d1..ad3f0cb 100644 --- a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc +++ b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc @@ -8,8 +8,9 @@ based endpoints for a client communicating with external servers over Websocket (as a client opening a websocket connection to an external server). + The component uses the <> component that in turn uses -the https://github.com/AsyncHttpClient/async-http-client[Async Http -Client] library. +the +https://github.com/AsyncHttpClient/async-http-client[Async Http Client] +library. Maven users will need to add the following dependency to their `pom.xml` for this component:
[camel] branch master updated: Camel-AHC: more docs spacing
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 bcde3ff Camel-AHC: more docs spacing bcde3ff is described below commit bcde3ff49915129423d72aadecc4c08323df483a Author: Andrea Cosentino AuthorDate: Mon May 27 09:52:45 2019 +0200 Camel-AHC: more docs spacing --- components/camel-ahc/src/main/docs/ahc-component.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/camel-ahc/src/main/docs/ahc-component.adoc b/components/camel-ahc/src/main/docs/ahc-component.adoc index 8bb4a7a..9e647b2 100644 --- a/components/camel-ahc/src/main/docs/ahc-component.adoc +++ b/components/camel-ahc/src/main/docs/ahc-component.adoc @@ -6,7 +6,9 @@ The ahc: component provides HTTP based endpoints for consuming external HTTP resources (as a client to call external servers using HTTP). -The component uses the https://github.com/AsyncHttpClient/async-http-client[Async Http Client] library. +The component uses the +https://github.com/AsyncHttpClient/async-http-client[Async Http Client] +library. Maven users will need to add the following dependency to their `pom.xml` for this component:
[camel] branch master updated: Camel-AHC: Fixed docs spacing
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 801b12d Camel-AHC: Fixed docs spacing 801b12d is described below commit 801b12de80c8f5a97433c5eaf13b2ff82d9bb741 Author: Andrea Cosentino AuthorDate: Mon May 27 09:50:24 2019 +0200 Camel-AHC: Fixed docs spacing --- components/camel-ahc/src/main/docs/ahc-component.adoc | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/components/camel-ahc/src/main/docs/ahc-component.adoc b/components/camel-ahc/src/main/docs/ahc-component.adoc index fd0ed79..8bb4a7a 100644 --- a/components/camel-ahc/src/main/docs/ahc-component.adoc +++ b/components/camel-ahc/src/main/docs/ahc-component.adoc @@ -3,12 +3,10 @@ *Available as of Camel version 2.8* -The *ahc:* component provides HTTP based endpoints +The ahc: component provides HTTP based endpoints for consuming external HTTP resources (as a client to call external -servers using HTTP). + - The component uses the -https://github.com/AsyncHttpClient/async-http-client[Async Http Client] -library. +servers using HTTP). +The component uses the https://github.com/AsyncHttpClient/async-http-client[Async Http Client] library. Maven users will need to add the following dependency to their `pom.xml` for this component: @@ -36,7 +34,7 @@ Will by default use port 80 for HTTP and 443 for HTTPS. You can append query options to the URI in the following format, `?option=value=value&...` -### AhcEndpoint Options +### Ahc Endpoint Options
[camel-website] branch asf-site updated: Website updated to 1498d48
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 ce8ece9 Website updated to 1498d48 ce8ece9 is described below commit ce8ece94dc4b712ac26ced99d200861c54757c5b Author: jenkins AuthorDate: Mon May 27 07:34:47 2019 + Website updated to 1498d48 --- sitemap-camel-k.xml| 42 +-- sitemap-components.xml | 746 - sitemap-manual.xml | 402 +- 3 files changed, 595 insertions(+), 595 deletions(-) diff --git a/sitemap-camel-k.xml b/sitemap-camel-k.xml index 241a8b8..662547a 100644 --- a/sitemap-camel-k.xml +++ b/sitemap-camel-k.xml @@ -2,86 +2,86 @@ http://www.sitemaps.org/schemas/sitemap/0.9;> https://camel.apache.org/staging/camel-k/latest/configuration/components.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/configuration/configmap-secret.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/configuration/configuration.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/configuration/dependencies.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/configuration/logging.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/index.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/installation/gke.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/installation/installation.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/installation/minikube.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/installation/minishift.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/installation/openshift.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/languages/groovy.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/languages/java.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/languages/javascript.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/languages/kotlin.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/languages/languages.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/languages/xml.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/running/dev-mode.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/running/running.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/traits.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/camel-k/latest/uninstalling.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z \ No newline at end of file diff --git a/sitemap-components.xml b/sitemap-components.xml index 4a5d659..1dd6ba7 100644 --- a/sitemap-components.xml +++ b/sitemap-components.xml @@ -2,1494 +2,1494 @@ http://www.sitemaps.org/schemas/sitemap/0.9;> https://camel.apache.org/staging/components/latest/activemq-component.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/components/latest/ahc-component.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/components/latest/ahc-ws-component.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/components/latest/amqp-component.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/components/latest/apns-component.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/components/latest/asn1-dataformat.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/components/latest/asterisk-component.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z https://camel.apache.org/staging/components/latest/atmos-component.html -2019-05-26T13:11:59.055Z +2019-05-27T07:33:51.813Z
[camel-website] branch master updated (3b0c20e -> 0ceba42)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git.
from 3b0c20e [CAMEL-12998] - Add user stories content
new 496a271 Yarn updated, ReadMe updated
new 0ceba42 Yarn updated inside antora
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:
.yarn/releases/{yarn-1.15.2.js => yarn-1.16.0.js} | 4103 ++--
.yarnrc|4 +-
README.md | 27 +-
.../.yarn/releases/yarn-1.16.0.js | 4103 ++--
antora-ui-camel/.yarnrc|4 +-
5 files changed, 4180 insertions(+), 4061 deletions(-)
copy .yarn/releases/{yarn-1.15.2.js => yarn-1.16.0.js} (99%)
copy .yarn/releases/yarn-1.15.2.js =>
antora-ui-camel/.yarn/releases/yarn-1.16.0.js (99%)
[camel] branch master updated: CAMEL-13557: Add property binding support to make it convenient to configure components and whatnot.
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 9b7c95c CAMEL-13557: Add property binding support to make it
convenient to configure components and whatnot.
9b7c95c is described below
commit 9b7c95c81bc2ba5a433529cad08eac45d138fa64
Author: Claus Ibsen
AuthorDate: Mon May 27 09:00:31 2019 +0200
CAMEL-13557: Add property binding support to make it convenient to
configure components and whatnot.
---
.../camel/main/MainConfigurationProperties.java| 16 +++
.../java/org/apache/camel/main/MainSupport.java| 8 +-
...opertyBindingSupportAutowireNestedDeepTest.java | 116 +
.../camel/support/PropertyBindingSupport.java | 41 ++--
4 files changed, 167 insertions(+), 14 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
b/core/camel-core/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
index 9e7e418..c45b33a 100644
---
a/core/camel-core/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
+++
b/core/camel-core/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
@@ -26,6 +26,7 @@ public class MainConfigurationProperties {
private boolean autoConfigurationEnabled = true;
private boolean autowireComponentProperties = true;
+private boolean autowireComponentPropertiesDeep;
private String name;
private int shutdownTimeout = 300;
private boolean shutdownSuppressLoggingOnTimeout;
@@ -117,6 +118,21 @@ public class MainConfigurationProperties {
this.autowireComponentProperties = autowireComponentProperties;
}
+public boolean isAutowireComponentPropertiesDeep() {
+return autowireComponentPropertiesDeep;
+}
+
+/**
+ * Whether autowiring components (with deep nesting by attempting to walk
as deep down the object graph by creating new empty objects on the way if
needed)
+ * with properties that are of same type, which has been added to the
Camel registry, as a singleton instance.
+ * This is used for convention over configuration to inject DataSource,
AmazonLogin instances to the components.
+ *
+ * This option is default disabled.
+ */
+public void setAutowireComponentPropertiesDeep(boolean
autowireComponentPropertiesDeep) {
+this.autowireComponentPropertiesDeep = autowireComponentPropertiesDeep;
+}
+
public String getName() {
return name;
}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
b/core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
index ab9bcd6..7157fcc 100644
--- a/core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
+++ b/core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
@@ -851,8 +851,8 @@ public abstract class MainSupport extends ServiceSupport {
// conventional configuration via properties to allow configuring
options on
// component, dataformat, and languages (like spring-boot
auto-configuration)
-if (mainConfigurationProperties.isAutowireComponentProperties()) {
-autoConfigurationFromRegistry(camelContext);
+if (mainConfigurationProperties.isAutowireComponentProperties() ||
mainConfigurationProperties.isAutowireComponentPropertiesDeep()) {
+autoConfigurationFromRegistry(camelContext,
mainConfigurationProperties.isAutowireComponentPropertiesDeep());
}
if (mainConfigurationProperties.isAutoConfigurationEnabled()) {
autoConfigurationFromProperties(camelContext);
@@ -1266,11 +1266,11 @@ public abstract class MainSupport extends
ServiceSupport {
}
}
-protected void autoConfigurationFromRegistry(CamelContext camelContext)
throws Exception {
+protected void autoConfigurationFromRegistry(CamelContext camelContext,
boolean deepNesting) throws Exception {
camelContext.addLifecycleStrategy(new LifecycleStrategySupport() {
@Override
public void onComponentAdd(String name, Component component) {
-
PropertyBindingSupport.autowireSingletonPropertiesFromRegistry(camelContext,
component, false, (obj, propertyName, type, value) -> {
+
PropertyBindingSupport.autowireSingletonPropertiesFromRegistry(camelContext,
component, false, deepNesting, (obj, propertyName, type, value) -> {
LOG.info("Auto configuring option: {} on component: {} as
one instance of type: {} registered in the Camel Registry",
propertyName,
component.getClass().getSimpleName(), type.getName());
});
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportAutowireNestedDeepTest.java
[camel] branch master updated: Fixed CS for camel-support
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 df44b35 Fixed CS for camel-support df44b35 is described below commit df44b357ab5d6496c5b29547a206c701edec11b0 Author: Andrea Cosentino AuthorDate: Mon May 27 08:24:22 2019 +0200 Fixed CS for camel-support --- .../main/java/org/apache/camel/support/PropertyBindingSupport.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java index 49ba9e6..4876513 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java @@ -16,9 +16,6 @@ */ package org.apache.camel.support; -import org.apache.camel.CamelContext; -import org.apache.camel.PropertyBindingException; - import java.lang.reflect.Method; import java.util.HashSet; import java.util.Iterator; @@ -26,6 +23,9 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; +import org.apache.camel.CamelContext; +import org.apache.camel.PropertyBindingException; + import static org.apache.camel.support.IntrospectionSupport.findSetterMethods; import static org.apache.camel.support.IntrospectionSupport.getOrElseProperty;
[camel] branch master updated: CAMEL-13557: Add property binding support to make it convenient to configure components and whatnot.
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 7d0abec CAMEL-13557: Add property binding support to make it
convenient to configure components and whatnot.
7d0abec is described below
commit 7d0abecc55a9e85ec4ca2be5db2c7ed9aeabefa2
Author: Claus Ibsen
AuthorDate: Mon May 27 08:22:49 2019 +0200
CAMEL-13557: Add property binding support to make it convenient to
configure components and whatnot.
---
.../java/org/apache/camel/support/PropertyBindingSupportTest.java | 4 ++--
.../main/java/org/apache/camel/support/PropertyBindingSupport.java| 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportTest.java
index 327c919..694abfb 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportTest.java
@@ -162,14 +162,14 @@ public class PropertyBindingSupportTest extends
ContextTestSupport {
}
@Test
-public void testAutowire() throws Exception {
+public void testAutowired() throws Exception {
Foo foo = new Foo();
PropertyBindingSupport.bindProperty(context, foo, "name", "James");
PropertyBindingSupport.bindProperty(context, foo, "bar.age", "33");
PropertyBindingSupport.bindProperty(context, foo, "bar.{{committer}}",
"true");
PropertyBindingSupport.bindProperty(context, foo, "bar.gold-customer",
"true");
-PropertyBindingSupport.bindProperty(context, foo, "bar.work",
"#autowire");
+PropertyBindingSupport.bindProperty(context, foo, "bar.work",
"#autowired");
assertEquals("James", foo.getName());
assertEquals(33, foo.getBar().getAge());
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
index 8aaeed2..49ba9e6 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
@@ -37,7 +37,7 @@ import static
org.apache.camel.support.IntrospectionSupport.getOrElseProperty;
* nested - Properties can be nested using the dot syntax (OGNL and
builder pattern using with as prefix), eg foo.bar=123
* reference by bean id - Values can refer to other beans in the
registry by prefixing with #nean: eg #bean:myBean
* reference by type - Values can refer to singleton beans by their
type in the registry by prefixing with #type: syntax, eg
#type:com.foo.MyClassType
- * autowire by type - Values can refer to singleton beans by auto
wiring by setting the value to #autowire
+ * autowire by type - Values can refer to singleton beans by auto
wiring by setting the value to #autowired
* reference new class - Values can refer to creating new beans by
their class name by prefixing with #class, eg #class:com.foo.MyClassType
*
* This implementations reuses parts of {@link IntrospectionSupport}.
@@ -397,7 +397,7 @@ public final class PropertyBindingSupport {
value = types.iterator().next();
}
}
-} else if (value.toString().equals("#autowire")) {
+} else if (value.toString().equals("#autowired")) {
// we should get the type from the setter
Method method = findBestSetterMethod(target.getClass(), name,
fluentBuilder);
if (method != null) {
