camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: CAMEL-8943: camel-jetty should use jetty9 as default
Date Mon, 28 Sep 2015 08:22:28 GMT
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 <davsclaus@apache.org>
Authored: Mon Sep 28 09:12:58 2015 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
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 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-jetty</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-jetty8</artifactId>
     </dependency>
     <dependency>

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 @@
         <include>org.apache.camel:camel-jclouds</include>
         <include>org.apache.camel:camel-jdbc</include>
         <include>org.apache.camel:camel-jetty-common</include>
+        <include>org.apache.camel:camel-jetty</include>
         <include>org.apache.camel:camel-jetty8</include>
         <include>org.apache.camel:camel-jetty9</include>
         <include>org.apache.camel:camel-jgroups</include>

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 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jetty8</artifactId>
+      <artifactId>camel-jetty</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

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 @@
     </dependency>
     <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-jetty9</artifactId>
+        <artifactId>camel-jetty</artifactId>
         <scope>test</scope>
     </dependency>
   </dependencies>

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 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jetty8</artifactId>
+      <artifactId>camel-jetty</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

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 @@
 
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jetty9</artifactId>
+      <artifactId>camel-jetty</artifactId>
       <scope>test</scope>
     </dependency>
 

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 @@
         <camel.osgi.import.before.defaults>
             javax.servlet.*;version="${servlet-version-range}"
         </camel.osgi.import.before.defaults>
-        <camel.osgi.export.pkg>org.apache.camel.component.jetty8</camel.osgi.export.pkg>
+        <camel.osgi.export.pkg>org.apache.camel.component.jetty9</camel.osgi.export.pkg>
         <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jetty</camel.osgi.export.service>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-jetty8</artifactId>
+            <artifactId>camel-jetty9</artifactId>
         </dependency>
     </dependencies>
 

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 @@
 
   <artifactId>camel-jetty8</artifactId>
   <packaging>bundle</packaging>
-  <name>Camel :: Jetty8</name>
+  <name>Camel :: Jetty8 (deprecated)</name>
   <description>Camel Jetty8 support</description>
 
   <properties>

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 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jetty8</artifactId>
+      <artifactId>camel-jetty</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

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 @@
 
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jetty9</artifactId>
+      <artifactId>camel-jetty</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

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 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jetty8</artifactId>
+      <artifactId>camel-jetty</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

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 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jetty8</artifactId>
+      <artifactId>camel-jetty</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

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 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jetty8</artifactId>
+      <artifactId>camel-jetty</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

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 @@
     <module>camel-http</module>
     <module>camel-http4</module>
     <module>camel-jetty-common</module>
+    <module>camel-jetty</module>
     <module>camel-jetty8</module>
     <module>camel-jetty9</module>
-    <!-- camel-jetty is used to republish the camel-jetty8 -->
-    <module>camel-jetty</module>
     <module>camel-cxf</module>
     <module>camel-cxf-transport</module>
     <module>camel-jms</module>

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 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-jetty</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-jetty8</artifactId>
         <version>${project.version}</version>
       </dependency>

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 @@
     <bundle>mvn:org.apache.camel/camel-jdbc/${project.version}</bundle>
   </feature>
   <feature name='camel-jetty' version='${project.version}' resolver='(obr)' start-level='50'>
+    <details>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</details>
     <feature>jetty</feature>
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>

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


Mime
View raw message