You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/05/13 18:59:44 UTC
[1/2] camel git commit: Camel catalog - skip spring-dm
Repository: camel
Updated Branches:
refs/heads/master b04748fe4 -> 85e5b59b3
Camel catalog - skip spring-dm
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4a882fa3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4a882fa3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4a882fa3
Branch: refs/heads/master
Commit: 4a882fa3a4fb26a5a16999d8b47e2fef7410c8b5
Parents: b04748f
Author: Claus Ibsen <da...@apache.org>
Authored: Fri May 13 20:56:15 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri May 13 20:56:15 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4a882fa3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index e001986..e45ee8b 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -304,6 +304,10 @@ public class PrepareCatalogMojo extends AbstractMojo {
File[] components = componentsDir.listFiles();
if (components != null) {
for (File dir : components) {
+ // skip camel-spring-dm
+ if (dir.isDirectory() && "camel-spring-dm".equals(dir.getName())) {
+ continue;
+ }
if (dir.isDirectory() && !"target".equals(dir.getName())) {
File target = new File(dir, "target/classes");
@@ -560,6 +564,10 @@ public class PrepareCatalogMojo extends AbstractMojo {
File[] languages = componentsDir.listFiles();
if (languages != null) {
for (File dir : languages) {
+ // skip camel-spring-dm
+ if (dir.isDirectory() && "camel-spring-dm".equals(dir.getName())) {
+ continue;
+ }
if (dir.isDirectory() && !"target".equals(dir.getName())) {
File target = new File(dir, "target/classes");
findLanguageFilesRecursive(target, jsonFiles, languageFiles, new CamelLanguagesFileFilter());
[2/2] camel git commit: Add missing doc
Posted by da...@apache.org.
Add missing doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/85e5b59b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/85e5b59b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/85e5b59b
Branch: refs/heads/master
Commit: 85e5b59b3905a16e4fab25aa2bdff2da9fa14f00
Parents: 4a882fa
Author: Claus Ibsen <da...@apache.org>
Authored: Fri May 13 20:59:11 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri May 13 20:59:11 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/model/HystrixDefinition.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/85e5b59b/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java b/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java
index 70d29b5..6251759 100644
--- a/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java
@@ -130,6 +130,9 @@ public class HystrixDefinition extends ProcessorDefinition<HystrixDefinition> {
return hystrixConfigurationRef;
}
+ /**
+ * Refers to a Hystrix configuration to use for configuring the Hystrix EIP.
+ */
public void setHystrixConfigurationRef(String hystrixConfigurationRef) {
this.hystrixConfigurationRef = hystrixConfigurationRef;
}