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 2015/03/21 07:22:02 UTC
[3/3] camel git commit: CAMEL-7999: Fixed catalog to use default
jetty component
CAMEL-7999: Fixed catalog to use default jetty component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c89f2790
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c89f2790
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c89f2790
Branch: refs/heads/camel-2.15.x
Commit: c89f2790468ff969d847fd664092c9d1c03f71cd
Parents: c7a60ab
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 21 07:23:20 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 21 07:23:54 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/maven/packaging/PackageHelper.java | 4 ++--
.../org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c89f2790/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
index c9da4bf..e3794d7 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
@@ -110,8 +110,8 @@ public final class PackageHelper {
@Override
public boolean accept(File pathname) {
- // skip camel-jetty8 as its a duplicate of camel-jetty9
- if ("camel-jetty8".equals(pathname)) {
+ // skip camel-jetty9 as its a duplicate of camel-jetty
+ if ("camel-jetty9".equals(pathname)) {
return false;
}
return pathname.isDirectory() || pathname.getName().endsWith(".json");
http://git-wip-us.apache.org/repos/asf/camel/blob/c89f2790/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 7b8846e..0a5625b 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
@@ -287,8 +287,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
File[] components = componentsDir.listFiles();
if (components != null) {
for (File dir : components) {
- // skip camel-jetty8 as its a duplicate of camel-jetty9
- if (dir.isDirectory() && !"camel-jetty8".equals(dir.getName()) && !"target".equals(dir.getName())) {
+ // skip camel-jetty9 as its a duplicate of camel-jetty8
+ if (dir.isDirectory() && !"camel-jetty9".equals(dir.getName()) && !"target".equals(dir.getName())) {
File target = new File(dir, "target/classes");
int before = componentFiles.size();