Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8546C18F22 for ; Mon, 28 Sep 2015 08:22:28 +0000 (UTC) Received: (qmail 65285 invoked by uid 500); 28 Sep 2015 08:22:28 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 65239 invoked by uid 500); 28 Sep 2015 08:22:28 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 65229 invoked by uid 99); 28 Sep 2015 08:22:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Sep 2015 08:22:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 238ABDFBAA; Mon, 28 Sep 2015 08:22:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Message-Id: <8fd2d67b5c5445fe8fb19702dcac27ee@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: camel git commit: CAMEL-8943: camel-jetty should use jetty9 as default Date: Mon, 28 Sep 2015 08:22:28 +0000 (UTC) Repository: camel Updated Branches: refs/heads/master bc9260414 -> 1f27ebc30 CAMEL-8943: camel-jetty should use jetty9 as default Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1f27ebc3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1f27ebc3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1f27ebc3 Branch: refs/heads/master Commit: 1f27ebc30de37a56338cee200aeecc8c12158366 Parents: bc92604 Author: Claus Ibsen Authored: Mon Sep 28 09:12:58 2015 +0200 Committer: Claus Ibsen Committed: Mon Sep 28 09:12:58 2015 +0200 ---------------------------------------------------------------------- apache-camel/pom.xml | 4 ++++ apache-camel/src/main/descriptors/common-bin.xml | 1 + components/camel-ahc/pom.xml | 2 +- components/camel-coap/pom.xml | 2 +- components/camel-cxf-transport/pom.xml | 2 +- components/camel-cxf/pom.xml | 2 +- components/camel-jetty/pom.xml | 4 ++-- components/camel-jetty8/pom.xml | 2 +- components/camel-quickfix/pom.xml | 2 +- components/camel-restlet/pom.xml | 2 +- components/camel-swagger/pom.xml | 2 +- components/camel-urlrewrite/pom.xml | 2 +- components/camel-xmlrpc/pom.xml | 2 +- components/pom.xml | 3 +-- parent/pom.xml | 5 +++++ platforms/karaf/features/src/main/resources/features.xml | 1 + .../org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 4 ++-- 17 files changed, 26 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/apache-camel/pom.xml ---------------------------------------------------------------------- diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index c691740..e21d22d 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -385,6 +385,10 @@ org.apache.camel + camel-jetty + + + org.apache.camel camel-jetty8 http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/apache-camel/src/main/descriptors/common-bin.xml ---------------------------------------------------------------------- diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml index 6bfca09..e281d9d 100644 --- a/apache-camel/src/main/descriptors/common-bin.xml +++ b/apache-camel/src/main/descriptors/common-bin.xml @@ -109,6 +109,7 @@ org.apache.camel:camel-jclouds org.apache.camel:camel-jdbc org.apache.camel:camel-jetty-common + org.apache.camel:camel-jetty org.apache.camel:camel-jetty8 org.apache.camel:camel-jetty9 org.apache.camel:camel-jgroups http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/components/camel-ahc/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml index 1178cb4..95422e2 100644 --- a/components/camel-ahc/pom.xml +++ b/components/camel-ahc/pom.xml @@ -70,7 +70,7 @@ org.apache.camel - camel-jetty8 + camel-jetty test http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/components/camel-coap/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-coap/pom.xml b/components/camel-coap/pom.xml index 596207a..8b0f247 100644 --- a/components/camel-coap/pom.xml +++ b/components/camel-coap/pom.xml @@ -70,7 +70,7 @@ org.apache.camel - camel-jetty9 + camel-jetty test http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/components/camel-cxf-transport/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml index e67e15a..1642a3a 100644 --- a/components/camel-cxf-transport/pom.xml +++ b/components/camel-cxf-transport/pom.xml @@ -104,7 +104,7 @@ org.apache.camel - camel-jetty8 + camel-jetty test http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/components/camel-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml index 31c4c82..903c803 100644 --- a/components/camel-cxf/pom.xml +++ b/components/camel-cxf/pom.xml @@ -218,7 +218,7 @@ org.apache.camel - camel-jetty9 + camel-jetty test http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/components/camel-jetty/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml index 3731197..a140e32 100644 --- a/components/camel-jetty/pom.xml +++ b/components/camel-jetty/pom.xml @@ -33,14 +33,14 @@ javax.servlet.*;version="${servlet-version-range}" - org.apache.camel.component.jetty8 + org.apache.camel.component.jetty9 org.apache.camel.spi.ComponentResolver;component=jetty org.apache.camel - camel-jetty8 + camel-jetty9 http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/components/camel-jetty8/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty8/pom.xml b/components/camel-jetty8/pom.xml index 7128f65..d632a76 100644 --- a/components/camel-jetty8/pom.xml +++ b/components/camel-jetty8/pom.xml @@ -27,7 +27,7 @@ camel-jetty8 bundle - Camel :: Jetty8 + Camel :: Jetty8 (deprecated) Camel Jetty8 support http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/components/camel-quickfix/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-quickfix/pom.xml b/components/camel-quickfix/pom.xml index 4b60e5c..bccc2f2 100644 --- a/components/camel-quickfix/pom.xml +++ b/components/camel-quickfix/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-jetty8 + camel-jetty test http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/components/camel-restlet/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml index 8b76c32..df3601d 100644 --- a/components/camel-restlet/pom.xml +++ b/components/camel-restlet/pom.xml @@ -75,7 +75,7 @@ org.apache.camel - camel-jetty9 + camel-jetty test http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/components/camel-swagger/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-swagger/pom.xml b/components/camel-swagger/pom.xml index 0e28087..ef68168 100644 --- a/components/camel-swagger/pom.xml +++ b/components/camel-swagger/pom.xml @@ -83,7 +83,7 @@ org.apache.camel - camel-jetty8 + camel-jetty test http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/components/camel-urlrewrite/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-urlrewrite/pom.xml b/components/camel-urlrewrite/pom.xml index cb1cbad..d58f63f 100644 --- a/components/camel-urlrewrite/pom.xml +++ b/components/camel-urlrewrite/pom.xml @@ -76,7 +76,7 @@ org.apache.camel - camel-jetty8 + camel-jetty test http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/components/camel-xmlrpc/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-xmlrpc/pom.xml b/components/camel-xmlrpc/pom.xml index e1e2c5b..40f87d0 100644 --- a/components/camel-xmlrpc/pom.xml +++ b/components/camel-xmlrpc/pom.xml @@ -77,7 +77,7 @@ org.apache.camel - camel-jetty8 + camel-jetty test http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/components/pom.xml ---------------------------------------------------------------------- diff --git a/components/pom.xml b/components/pom.xml index f033c40..a2e96be 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -49,10 +49,9 @@ camel-http camel-http4 camel-jetty-common + camel-jetty camel-jetty8 camel-jetty9 - - camel-jetty camel-cxf camel-cxf-transport camel-jms http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index c6fda1d..f07cdcf 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1047,6 +1047,11 @@ org.apache.camel + camel-jetty + ${project.version} + + + org.apache.camel camel-jetty8 ${project.version} http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index e762442..d664d25 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -828,6 +828,7 @@ mvn:org.apache.camel/camel-jdbc/${project.version} +
camel-jetty intend to work with jetty8, so this feature only works in the karaf container which support jetty8, e.g. karaf 2.x/3.x
jetty camel-core mvn:org.apache.camel/camel-http-common/${project.version} http://git-wip-us.apache.org/repos/asf/camel/blob/1f27ebc3/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 6c0a522..e25f4d9 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 @@ -296,8 +296,8 @@ public class PrepareCatalogMojo extends AbstractMojo { File[] components = componentsDir.listFiles(); if (components != null) { for (File dir : components) { - // skip camel-jetty9 as its a duplicate of camel-jetty8 - if (dir.isDirectory() && !"camel-jetty9".equals(dir.getName()) && !"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"); // special for camel-salesforce which is in a sub dir