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/02/26 11:29:58 UTC
[1/2] camel git commit: CAMEL-8406: Include component docs for jetty
Repository: camel
Updated Branches:
refs/heads/master a7dfc4509 -> 8fbd40f25
CAMEL-8406: Include component docs for jetty
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/13cb7b60
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/13cb7b60
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/13cb7b60
Branch: refs/heads/master
Commit: 13cb7b607b25286c0cbf0846692aa8ffb315cde3
Parents: a7dfc45
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Feb 26 11:23:07 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Feb 26 11:23:07 2015 +0100
----------------------------------------------------------------------
.../apache/camel/component/jetty8/JettyHttpComponent8.java | 6 ++----
.../org/apache/camel/component/jetty8/JettyHttpEndpoint8.java | 4 ++++
.../apache/camel/component/jetty9/JettyHttpComponent9.java | 7 +++----
.../org/apache/camel/component/jetty9/JettyHttpEndpoint9.java | 3 +++
4 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/13cb7b60/components/camel-jetty8/src/main/java/org/apache/camel/component/jetty8/JettyHttpComponent8.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty8/src/main/java/org/apache/camel/component/jetty8/JettyHttpComponent8.java b/components/camel-jetty8/src/main/java/org/apache/camel/component/jetty8/JettyHttpComponent8.java
index 68719e3..bd5f04a 100644
--- a/components/camel-jetty8/src/main/java/org/apache/camel/component/jetty8/JettyHttpComponent8.java
+++ b/components/camel-jetty8/src/main/java/org/apache/camel/component/jetty8/JettyHttpComponent8.java
@@ -117,10 +117,8 @@ public class JettyHttpComponent8 extends JettyHttpComponent {
}
}
- } catch (RuntimeException rex) {
- throw rex;
- } catch (Exception ex) {
- throw new RuntimeException(ex);
+ } catch (Exception e) {
+ throw ObjectHelper.wrapRuntimeCamelException(e);
}
return result;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/13cb7b60/components/camel-jetty8/src/main/java/org/apache/camel/component/jetty8/JettyHttpEndpoint8.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty8/src/main/java/org/apache/camel/component/jetty8/JettyHttpEndpoint8.java b/components/camel-jetty8/src/main/java/org/apache/camel/component/jetty8/JettyHttpEndpoint8.java
index 9cbd353..ee4d0a8 100644
--- a/components/camel-jetty8/src/main/java/org/apache/camel/component/jetty8/JettyHttpEndpoint8.java
+++ b/components/camel-jetty8/src/main/java/org/apache/camel/component/jetty8/JettyHttpEndpoint8.java
@@ -19,11 +19,15 @@ package org.apache.camel.component.jetty8;
import java.net.URI;
import java.net.URISyntaxException;
+import org.apache.camel.component.http.HttpConsumer;
import org.apache.camel.component.jetty.JettyContentExchange;
import org.apache.camel.component.jetty.JettyHttpComponent;
import org.apache.camel.component.jetty.JettyHttpEndpoint;
+import org.apache.camel.spi.UriEndpoint;
+@UriEndpoint(scheme = "jetty", consumerClass = HttpConsumer.class, label = "http")
public class JettyHttpEndpoint8 extends JettyHttpEndpoint {
+
public JettyHttpEndpoint8(JettyHttpComponent component, String uri, URI httpURL) throws URISyntaxException {
super(component, uri, httpURL);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/13cb7b60/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
index ec53cdc..66a49cf 100644
--- a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
+++ b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
@@ -26,6 +26,7 @@ import org.apache.camel.component.jetty.CamelHttpClient;
import org.apache.camel.component.jetty.JettyHttpComponent;
import org.apache.camel.component.jetty.JettyHttpEndpoint;
import org.apache.camel.util.IntrospectionSupport;
+import org.apache.camel.util.ObjectHelper;
import org.eclipse.jetty.server.AbstractConnector;
import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.Connector;
@@ -131,10 +132,8 @@ public class JettyHttpComponent9 extends JettyHttpComponent {
}
}
return result;
- } catch (RuntimeException rex) {
- throw rex;
- } catch (Exception ex) {
- throw new RuntimeException(ex);
+ } catch (Exception e) {
+ throw ObjectHelper.wrapRuntimeCamelException(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/13cb7b60/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
index 9ead2b1..4cbef36 100644
--- a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
+++ b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
@@ -20,10 +20,13 @@ import java.net.URI;
import java.net.URISyntaxException;
import org.apache.camel.component.http.HttpBinding;
+import org.apache.camel.component.http.HttpConsumer;
import org.apache.camel.component.jetty.JettyContentExchange;
import org.apache.camel.component.jetty.JettyHttpComponent;
import org.apache.camel.component.jetty.JettyHttpEndpoint;
+import org.apache.camel.spi.UriEndpoint;
+@UriEndpoint(scheme = "jetty", consumerClass = HttpConsumer.class, label = "http")
public class JettyHttpEndpoint9 extends JettyHttpEndpoint {
private HttpBinding binding;
[2/2] camel git commit: CAMEL-8406: skip camel-jetty8 as its a
duplicate of camel-jetty9 in catalog.
Posted by da...@apache.org.
CAMEL-8406: skip camel-jetty8 as its a duplicate of camel-jetty9 in catalog.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8fbd40f2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8fbd40f2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8fbd40f2
Branch: refs/heads/master
Commit: 8fbd40f25e298bcf173f5b73025a101d23643f69
Parents: 13cb7b6
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Feb 26 11:30:58 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Feb 26 11:30:58 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/maven/packaging/PackageHelper.java | 4 ++++
.../org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8fbd40f2/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 1ae21c6..c9da4bf 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,6 +110,10 @@ 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)) {
+ return false;
+ }
return pathname.isDirectory() || pathname.getName().endsWith(".json");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8fbd40f2/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 37f4041..7b8846e 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,7 +287,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
File[] components = componentsDir.listFiles();
if (components != null) {
for (File dir : components) {
- if (dir.isDirectory() && !"target".equals(dir.getName())) {
+ // skip camel-jetty8 as its a duplicate of camel-jetty9
+ if (dir.isDirectory() && !"camel-jetty8".equals(dir.getName()) && !"target".equals(dir.getName())) {
File target = new File(dir, "target/classes");
int before = componentFiles.size();