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:00 UTC
[1/3] camel git commit: CAMEL-7999: Fixed catalog to use default
jetty component
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 74f9ea0be -> c89f27904
refs/heads/master 32b4fd25d -> 1aa206102
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/1aa20610
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1aa20610
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1aa20610
Branch: refs/heads/master
Commit: 1aa2061023bfff846e4f3eb3a52d291462a3bf1b
Parents: 32b4fd2
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:20 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/1aa20610/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/1aa20610/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();
[2/3] camel git commit: Fix CS errors
Posted by da...@apache.org.
Fix CS errors
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c7a60abc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c7a60abc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c7a60abc
Branch: refs/heads/camel-2.15.x
Commit: c7a60abcc509fdba50882f6d544eaff09b58804d
Parents: 74f9ea0
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Fri Mar 20 20:41:06 2015 -0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 21 07:23:50 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/catalog/DefaultCamelCatalog.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c7a60abc/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index bc10145..cd4a11b 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -472,7 +472,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
// parse the syntax and find the same group in the uri
Matcher matcher = SYNTAX_PATTERN.matcher(syntax);
List<String> word = new ArrayList<String>();
- while (matcher.find() ) {
+ while (matcher.find()) {
String s = matcher.group(1);
if (!scheme.equals(s)) {
word.add(s);
@@ -647,7 +647,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
// parse the syntax into each options
Matcher matcher = SYNTAX_PATTERN.matcher(originalSyntax);
List<String> options = new ArrayList<String>();
- while (matcher.find() ) {
+ while (matcher.find()) {
String s = matcher.group(1);
options.add(s);
}
@@ -655,7 +655,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
// parse the syntax into each options
Matcher matcher2 = SYNTAX_PATTERN.matcher(syntax);
List<String> options2 = new ArrayList<String>();
- while (matcher2.find() ) {
+ while (matcher2.find()) {
String s = matcher2.group(1);
options2.add(s);
}
[3/3] camel git commit: CAMEL-7999: Fixed catalog to use default
jetty component
Posted by da...@apache.org.
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();