[1/4] camel git commit: Component docs - polished
Repository: camel Updated Branches: refs/heads/master dfa2456cc -> 71d4ae2a7 Component docs - polished Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6cc72245 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6cc72245 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6cc72245 Branch: refs/heads/master Commit: 6cc72245d5873e52d8e68ab1c705beee5645f88f Parents: dfa2456 Author: Claus IbsenAuthored: Mon Mar 6 17:50:38 2017 +0100 Committer: Claus Ibsen Committed: Mon Mar 6 17:50:38 2017 +0100 -- .../src/main/resources/endpoint-options.mvel | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/6cc72245/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel -- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel index 4d43044..e0c95df 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel +++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel @@ -1,7 +1,9 @@ -The @{title} component is configured using the URI syntax with the following path and query parameters: +The @{title} endpoint is configured using URI syntax: @{syntax} + with the following path and query parameters: + Path Parameters (@{endpointPathOptions.size()} parameters): [width="100%",cols="2,1,1m,6",options="header"]
[1/4] camel git commit: Component docs
Repository: camel Updated Branches: refs/heads/camel-2.16.x cf474047d -> e8b1ba6e0 refs/heads/master eef022e26 -> 6e0550c78 Component docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a580d3a0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a580d3a0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a580d3a0 Branch: refs/heads/master Commit: a580d3a0de2941d860bcda76a5c90b1147250951 Parents: eef022e Author: Claus IbsenAuthored: Thu Jan 7 20:38:42 2016 +0100 Committer: Claus Ibsen Committed: Thu Jan 7 20:38:42 2016 +0100 -- .../org/apache/camel/component/docker/DockerConfiguration.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a580d3a0/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java -- diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java index 442bc83..2a9ec62 100644 --- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java +++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java @@ -28,7 +28,10 @@ import org.apache.camel.spi.UriPath; @UriParams public class DockerConfiguration implements Cloneable { -@UriPath @Metadata(required = "true") +@UriPath(enums = "events,stats,auth,info,ping,version,imagebuild,imagecreate,imageinspect,imagelist,imagepull,imagepush" ++ "imageremove,imagesearch,imagetag,containerattach,containercommit,containercopyfile,containercreate,containerdiff" ++ "inspectcontainer,containerkill,containerlist,containerlog,containerpause,containerrestart,containerremove,containerstart" ++ "containerstop,containertop,containerunpause,containerwait,execcreate,execstart") @Metadata(required = "true") private DockerOperation operation; @UriParam(defaultValue = "localhost") @Metadata(required = "true") private String host = "localhost";
[1/4] camel git commit: Component docs - Fixed invalid uris
Repository: camel Updated Branches: refs/heads/camel-2.16.x 2801a7151 -> 8c49ea9c8 refs/heads/master 6b86f917f -> 538876084 Component docs - Fixed invalid uris Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/37489762 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/37489762 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/37489762 Branch: refs/heads/master Commit: 37489762ef99a6c8832f513ab9d05863b18fd544 Parents: 6b86f91 Author: Claus IbsenAuthored: Wed Jan 6 18:08:31 2016 +0100 Committer: Claus Ibsen Committed: Wed Jan 6 18:19:07 2016 +0100 -- .../xmlsecurity/XmlSignatureComponent.java | 2 +- .../xmlsecurity/XmlSignatureEndpoint.java | 3 +- .../xmlsecurity/ECDSASignatureTest.java | 24 ++--- .../xmlsecurity/SignatureAlgorithmTest.java | 68 +++--- .../xmlsecurity/SignatureDigestMethodTest.java | 44 - .../xmlsecurity/SpringXmlSignatureTest.java | 12 +-- .../XAdESSignaturePropertiesTest.java | 10 +-- .../component/xmlsecurity/XmlSignatureTest.java | 94 ++-- .../xmlsecurity/SpringXmlSignatureTests.xml | 80 - 9 files changed, 168 insertions(+), 169 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/37489762/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java -- diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java index 169a39b..9b2928b 100644 --- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java +++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java @@ -55,7 +55,7 @@ public class XmlSignatureComponent extends UriEndpointComponent { throw new MalformedURLException( String.format( "An invalid xmlsecurity uri was provided '%s'." -+ " Check the uri matches the format xmlsecurity:sign:// or xmlsecurity:verify://", ++ " Check the uri matches the format xmlsecurity:sign:// or xmlsecurity:verify:", uri ) ); http://git-wip-us.apache.org/repos/asf/camel/blob/37489762/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureEndpoint.java -- diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureEndpoint.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureEndpoint.java index c3883fe..d782501 100644 --- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureEndpoint.java +++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureEndpoint.java @@ -34,7 +34,7 @@ import org.apache.camel.spi.UriPath; /** * Used to sign and verify exchanges using the XML signature specification. */ -@UriEndpoint(scheme = "xmlsecurity", title = "XML Security", syntax = "xmlsecurity:command/name", producerOnly = true, label = "security,transformation") +@UriEndpoint(scheme = "xmlsecurity", title = "XML Security", syntax = "xmlsecurity:command:name", producerOnly = true, label = "security,transformation") public abstract class XmlSignatureEndpoint extends DefaultEndpoint { @UriPath @Metadata(required = "true") @@ -142,7 +142,6 @@ public abstract class XmlSignatureEndpoint extends DefaultEndpoint { public void setSchemaResourceUri(String schemaResourceUri) { getConfiguration().setSchemaResourceUri(schemaResourceUri); - } public String getOutputXmlEncoding() { http://git-wip-us.apache.org/repos/asf/camel/blob/37489762/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java -- diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java index 71d603e..df5f8ce 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java +++
[1/4] camel git commit: Component docs - Add missing options and fixed invalid configurations
Repository: camel Updated Branches: refs/heads/camel-2.16.x 367eb6573 -> b98c8ae65 refs/heads/master 1e5bc2487 -> ec91dc5af Component docs - Add missing options and fixed invalid configurations Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5633d3f3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5633d3f3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5633d3f3 Branch: refs/heads/master Commit: 5633d3f32f4961705916c3a49bd880727231afe2 Parents: 1e5bc24 Author: Claus IbsenAuthored: Sun Jan 3 12:01:16 2016 +0100 Committer: Claus Ibsen Committed: Sun Jan 3 12:01:16 2016 +0100 -- .../org/apache/camel/component/mock/MockComponent.java | 1 + .../org/apache/camel/component/mock/MockEndpoint.java | 13 + .../camel/component/file/FileNoOpLockFileTest.java | 2 +- .../stress/FileAsyncStressReadLockLockFileTest.java| 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/5633d3f3/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java -- diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java b/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java index 3bd356e..7f42a89 100644 --- a/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java @@ -44,6 +44,7 @@ public class MockComponent extends UriEndpointComponent { if (value != null) { Processor reporter = new ThroughputLogger(new CamelLogger("org.apache.camel.component.mock:" + remaining), value); endpoint.setReporter(reporter); +endpoint.setReportGroup(value); } return endpoint; } http://git-wip-us.apache.org/repos/asf/camel/blob/5633d3f3/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java -- diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java index ab4801d..8c4157e 100644 --- a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java @@ -133,6 +133,8 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint { private int retainFirst; @UriParam(label = "producer", defaultValue = "-1") private int retainLast; +@UriParam(label = "producer") +private int reportGroup; @UriParam(label = "producer,advanced", defaultValue = "true") private boolean copyOnExchange = true; @@ -1219,6 +1221,17 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint { this.retainLast = retainLast; } +public int isReportGroup() { +return reportGroup; +} + +/** + * A number that is used to turn on throughput logging based on groups of the size. + */ +public void setReportGroup(int reportGroup) { +this.reportGroup = reportGroup; +} + public boolean isCopyOnExchange() { return copyOnExchange; } http://git-wip-us.apache.org/repos/asf/camel/blob/5633d3f3/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java -- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java index 248973a..afe7642 100644 --- a/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java @@ -84,7 +84,7 @@ public class FileNoOpLockFileTest extends ContextTestSupport { to("mock:report"); // for no locks - from("file://target/reports/notlocked/?noop=true=false").process(new MyNoopProcessor()). + from("file://target/reports/notlocked/?noop=true=none").process(new MyNoopProcessor()). to("mock:report"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/5633d3f3/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockLockFileTest.java -- diff --git
[1/4] camel git commit: Component docs - Fixed invalid syntax in language component
Repository: camel Updated Branches: refs/heads/camel-2.16.x b98c8ae65 -> 6c211d494 refs/heads/master ec91dc5af -> ff75709b4 Component docs - Fixed invalid syntax in language component Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/334f5e11 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/334f5e11 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/334f5e11 Branch: refs/heads/master Commit: 334f5e112e742d5c7a8f84cdc13f80d03efd1999 Parents: ec91dc5 Author: Claus IbsenAuthored: Sun Jan 3 12:31:44 2016 +0100 Committer: Claus Ibsen Committed: Sun Jan 3 12:31:44 2016 +0100 -- .../component/language/LanguageEndpoint.java | 18 ++ 1 file changed, 18 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/334f5e11/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java -- diff --git a/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java index a48b487..7afb5f1 100644 --- a/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java @@ -55,6 +55,9 @@ public class LanguageEndpoint extends ResourceEndpoint { private boolean contentResolvedFromResource; @UriPath(enums = "bean,constant,el,exchangeProperty,file,groovy,header,jsonpath,jxpath,mvel,ognl,ref,simple,spel,sql,terser,tokenize,xpath,xquery,xtokenize") @Metadata(required = "true") private String languageName; +// resourceUri is optional in the language endpoint +@UriPath(description = "Path to the resource, or a reference to lookup a bean in the Registry to use as the resource") @Metadata(required = "false") +private String resourceUri; @UriParam private String script; @UriParam(defaultValue = "true") @@ -187,6 +190,21 @@ public class LanguageEndpoint extends ResourceEndpoint { } /** + * Path to the resource, or a reference to lookup a bean in the Registry to use as the resource + * + * @param resourceUri the resource path + */ +@Override +public void setResourceUri(String resourceUri) { +super.setResourceUri(resourceUri); +} + +@Override +public String getResourceUri() { +return super.getResourceUri(); +} + +/** * Sets the script to execute * * @param script the script
[1/4] camel git commit: Component docs
Repository: camel Updated Branches: refs/heads/master f0f0b9f33 - fc38b2e67 Component docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e7fe9dc1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e7fe9dc1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e7fe9dc1 Branch: refs/heads/master Commit: e7fe9dc1ba93684b4eac6238e5b4095c53b7715e Parents: f0f0b9f Author: Claus Ibsen davscl...@apache.org Authored: Thu Jun 18 13:32:20 2015 +0200 Committer: Claus Ibsen davscl...@apache.org Committed: Thu Jun 18 13:32:20 2015 +0200 -- .../main/java/org/apache/camel/component/http/HttpEndpoint.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e7fe9dc1/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java -- diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java index 33c0e56..bbaf54a 100644 --- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java +++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java @@ -95,7 +95,8 @@ public class HttpEndpoint extends DefaultEndpoint implements HeaderFilterStrateg private int proxyPort; @UriParam(label = producer, enums = Basic,Digest,NTLM, description = Authentication method for proxy, either as Basic, Digest or NTLM.) private String authMethodPriority; -@UriParam +@UriParam(description = Option to disable throwing the HttpOperationFailedException in case of failed responses from the remote server. ++ This allows you to get all responses regardless of the HTTP status code.) private boolean transferException; @UriParam(label = consumer, description = Specifies whether to enable HTTP TRACE for this Jetty consumer. By default TRACE is turned off.)
[1/4] camel git commit: Component docs
Repository: camel Updated Branches: refs/heads/master 8d6a94ea0 - 4cc3541be Component docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5b6134ba Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5b6134ba Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5b6134ba Branch: refs/heads/master Commit: 5b6134baeabc72b9607f25577685dba7280db10b Parents: 8d6a94e Author: Claus Ibsen davscl...@apache.org Authored: Mon May 11 09:05:18 2015 +0200 Committer: Claus Ibsen davscl...@apache.org Committed: Mon May 11 09:05:18 2015 +0200 -- .../camel/component/cache/CacheComponent.java | 5 ++ .../component/cache/CacheConfiguration.java | 57 ++-- .../camel/component/cache/CacheEndpoint.java| 14 + 3 files changed, 72 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/5b6134ba/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java -- diff --git a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java index c19d0c0..d46f40c 100755 --- a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java +++ b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java @@ -62,6 +62,11 @@ public class CacheComponent extends UriEndpointComponent { return cacheManagerFactory; } +/** + * To use the given CacheManagerFactory for creating the CacheManager. + * p/ + * By default the DefaultCacheManagerFactory is used. + */ public void setCacheManagerFactory(CacheManagerFactory cacheManagerFactory) { this.cacheManagerFactory = cacheManagerFactory; } http://git-wip-us.apache.org/repos/asf/camel/blob/5b6134ba/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java -- diff --git a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java index e55d6c4..fe5d99f 100755 --- a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java +++ b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import net.sf.ehcache.store.MemoryStoreEvictionPolicy; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; import org.apache.camel.spi.UriPath; @@ -28,15 +29,16 @@ import org.apache.camel.util.URISupport; @UriParams public class CacheConfiguration implements Cloneable { -@UriPath +@UriPath @Metadata(required = true) private String cacheName; @UriParam(defaultValue = 1000) private int maxElementsInMemory = 1000; -@UriParam(defaultValue = LFU, enums = LRU,LFU,FIFO,CLOCK) +@UriParam(defaultValue = LFU, enums = LRU,LFU,FIFO) private MemoryStoreEvictionPolicy memoryStoreEvictionPolicy = MemoryStoreEvictionPolicy.LFU; @UriParam(defaultValue = true) private boolean overflowToDisk = true; @UriParam +@Deprecated private String diskStorePath; @UriParam private boolean eternal; @@ -125,6 +127,9 @@ public class CacheConfiguration implements Cloneable { return cacheName; } +/** + * Name of the cache + */ public void setCacheName(String cacheName) { this.cacheName = cacheName; } @@ -133,6 +138,9 @@ public class CacheConfiguration implements Cloneable { return maxElementsInMemory; } +/** + * The number of elements that may be stored in the defined cache in memory. + */ public void setMaxElementsInMemory(int maxElementsInMemory) { this.maxElementsInMemory = maxElementsInMemory; } @@ -141,8 +149,16 @@ public class CacheConfiguration implements Cloneable { return memoryStoreEvictionPolicy; } -public void setMemoryStoreEvictionPolicy( -MemoryStoreEvictionPolicy memoryStoreEvictionPolicy) { +/** + * Which eviction strategy to use when maximum number of elements in memory is reached. The strategy defines + * which elements to be removed. + * ul + * liLRU - Lest Recently Used/li + * liLFU - Lest Frequently Used/li + * liFIFO - First In First Out/li + * /ul + */ +public void setMemoryStoreEvictionPolicy(MemoryStoreEvictionPolicy