You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/19 07:27:51 UTC
[camel] branch master updated (0a01693 -> 44b739b)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 0a01693 Merge pull request #3109 from apache/CAMEL-13853
new 0ddda5b Revert "cleanups for camel-netty9 to camel-netty component renaming"
new 44b739b Reflect reverting on MIGRATION guide
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
MIGRATION.md | 2 +-
.../META-INF/maven/archetype-metadata.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 2 +-
components/camel-jetty/pom.xml | 14 +++++++-------
.../component/{jetty => jetty9}/AttachmentHttpBinding.java | 6 +++---
.../component/{jetty => jetty9}/CamelHttpClient9.java | 9 +++++----
.../{jetty => jetty9}/CamelInputStreamContentProvider.java | 2 +-
.../component/{jetty => jetty9}/HttpSendDynamicAware.java | 2 +-
.../component/{jetty => jetty9}/JettyContentExchange9.java | 4 +++-
.../component/{jetty => jetty9}/JettyHttpComponent9.java | 11 +++++++----
.../component/{jetty => jetty9}/JettyHttpEndpoint9.java | 12 ++++++++----
.../org/apache/camel/component/jetty/BaseJettyTest.java | 5 +++++
.../component/jetty/HttpProducerSendEmptyHeaderTest.java | 6 ++++--
.../component/jetty/JettyComponentSpringConfiguredTest.xml | 2 +-
.../org/apache/camel/component/jetty/jetty-https.xml | 2 +-
.../camel-salesforce/camel-salesforce-component/pom.xml | 14 +++++++-------
.../camel-salesforce/camel-salesforce-maven-plugin/pom.xml | 6 +++---
examples/camel-example-cdi-rest-servlet/pom.xml | 8 ++++----
examples/camel-example-servlet-tomcat/pom.xml | 2 +-
parent/pom.xml | 3 ++-
.../springboot/JettyHttpComponentAutoConfiguration9.java | 4 ++--
.../springboot/JettyHttpComponentConfiguration9.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
tests/camel-performance/pom.xml | 8 ++++----
24 files changed, 75 insertions(+), 57 deletions(-)
rename components/camel-jetty/src/main/java/org/apache/camel/component/{jetty => jetty9}/AttachmentHttpBinding.java (99%)
rename components/camel-jetty/src/main/java/org/apache/camel/component/{jetty => jetty9}/CamelHttpClient9.java (94%)
rename components/camel-jetty/src/main/java/org/apache/camel/component/{jetty => jetty9}/CamelInputStreamContentProvider.java (93%)
rename components/camel-jetty/src/main/java/org/apache/camel/component/{jetty => jetty9}/HttpSendDynamicAware.java (95%)
rename components/camel-jetty/src/main/java/org/apache/camel/component/{jetty => jetty9}/JettyContentExchange9.java (98%)
rename components/camel-jetty/src/main/java/org/apache/camel/component/{jetty => jetty9}/JettyHttpComponent9.java (95%)
rename components/camel-jetty/src/main/java/org/apache/camel/component/{jetty => jetty9}/JettyHttpEndpoint9.java (89%)
rename platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/{jetty => jetty9}/springboot/JettyHttpComponentAutoConfiguration9.java (98%)
rename platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/{jetty => jetty9}/springboot/JettyHttpComponentConfiguration9.java (99%)
[camel] 01/02: Revert "cleanups for camel-netty9 to camel-netty
component renaming"
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0ddda5bf95750696dffe342dd7f1d5a932ce55e5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 19 08:56:55 2019 +0200
Revert "cleanups for camel-netty9 to camel-netty component renaming"
This reverts commit 43feac0b8d110eb04ee005e059e59ad662dab68e.
---
.../META-INF/maven/archetype-metadata.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 2 +-
components/camel-jetty/pom.xml | 14 +++++++-------
.../component/{jetty => jetty9}/AttachmentHttpBinding.java | 6 +++---
.../component/{jetty => jetty9}/CamelHttpClient9.java | 9 +++++----
.../{jetty => jetty9}/CamelInputStreamContentProvider.java | 2 +-
.../component/{jetty => jetty9}/HttpSendDynamicAware.java | 2 +-
.../component/{jetty => jetty9}/JettyContentExchange9.java | 4 +++-
.../component/{jetty => jetty9}/JettyHttpComponent9.java | 11 +++++++----
.../component/{jetty => jetty9}/JettyHttpEndpoint9.java | 12 ++++++++----
.../org/apache/camel/component/jetty/BaseJettyTest.java | 5 +++++
.../component/jetty/HttpProducerSendEmptyHeaderTest.java | 6 ++++--
.../component/jetty/JettyComponentSpringConfiguredTest.xml | 2 +-
.../org/apache/camel/component/jetty/jetty-https.xml | 2 +-
.../camel-salesforce/camel-salesforce-component/pom.xml | 14 +++++++-------
.../camel-salesforce/camel-salesforce-maven-plugin/pom.xml | 6 +++---
examples/camel-example-cdi-rest-servlet/pom.xml | 8 ++++----
examples/camel-example-servlet-tomcat/pom.xml | 2 +-
parent/pom.xml | 3 ++-
.../springboot/JettyHttpComponentAutoConfiguration9.java | 4 ++--
.../springboot/JettyHttpComponentConfiguration9.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
tests/camel-performance/pom.xml | 8 ++++----
23 files changed, 74 insertions(+), 56 deletions(-)
diff --git a/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
index 5ac238b..12792ab 100644
--- a/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
+++ b/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
@@ -24,8 +24,8 @@
<requiredProperty key="camel-version">
<defaultValue>${project.version}</defaultValue>
</requiredProperty>
- <requiredProperty key="jetty-version">
- <defaultValue>${jetty-version}</defaultValue>
+ <requiredProperty key="jetty9-version">
+ <defaultValue>${jetty9-version}</defaultValue>
</requiredProperty>
<requiredProperty key="jetty-plugin-version">
<defaultValue>${jetty-plugin-version}</defaultValue>
diff --git a/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
index 114bc3d..3e9f75a 100644
--- a/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
@@ -119,7 +119,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
<configuration>
<webApp>
<contextPath>/${project.artifactId}</contextPath>
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index 3a1cccc..2f1e044 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
@@ -65,32 +65,32 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/AttachmentHttpBinding.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java
similarity index 99%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty/AttachmentHttpBinding.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java
index 9dd3494..ecdf7af 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/AttachmentHttpBinding.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty;
+package org.apache.camel.component.jetty9;
import java.io.IOException;
import java.io.InputStream;
@@ -118,7 +118,7 @@ final class AttachmentHttpBinding extends DefaultHttpBinding {
}
}
}
-
+
final class PartDataSource implements DataSource {
private final Part part;
@@ -146,4 +146,4 @@ final class AttachmentHttpBinding extends DefaultHttpBinding {
return part.getContentType();
}
}
-}
+}
\ No newline at end of file
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelHttpClient9.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/CamelHttpClient9.java
similarity index 94%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelHttpClient9.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/CamelHttpClient9.java
index 4eb3e8f..b9463c4 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelHttpClient9.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/CamelHttpClient9.java
@@ -14,16 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty;
+package org.apache.camel.component.jetty9;
import java.util.concurrent.Executor;
+import org.apache.camel.component.jetty.CamelHttpClient;
import org.eclipse.jetty.client.HttpClientTransport;
import org.eclipse.jetty.util.ssl.SslContextFactory;
@Deprecated
public class CamelHttpClient9 extends CamelHttpClient {
-
+
public CamelHttpClient9(SslContextFactory sslContextFactory) {
super(sslContextFactory);
}
@@ -41,7 +42,7 @@ public class CamelHttpClient9 extends CamelHttpClient {
protected void setThreadPoolOrExecutor(Executor pool) {
setExecutor(pool);
}
-
+
@Override
public void setProxy(String host, int port) {
getProxyConfiguration().getProxies().add(new org.eclipse.jetty.client.HttpProxy(host, port));
@@ -56,5 +57,5 @@ public class CamelHttpClient9 extends CamelHttpClient {
public int getProxyPort() {
return getProxyConfiguration().getProxies().get(0).getAddress().getPort();
}
-
+
}
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelInputStreamContentProvider.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
similarity index 93%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelInputStreamContentProvider.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
index ad56f13..a1e0d0f 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelInputStreamContentProvider.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty;
+package org.apache.camel.component.jetty9;
import java.io.InputStream;
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/HttpSendDynamicAware.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/HttpSendDynamicAware.java
similarity index 95%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty/HttpSendDynamicAware.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/HttpSendDynamicAware.java
index 04d1a31..de6b492 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/HttpSendDynamicAware.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/HttpSendDynamicAware.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty;
+package org.apache.camel.component.jetty9;
import org.apache.camel.spi.annotations.SendDynamic;
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange9.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
similarity index 98%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange9.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
index acb64cc..a1c6541 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange9.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty;
+package org.apache.camel.component.jetty9;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
@@ -36,6 +36,8 @@ import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangeTimedOutException;
import org.apache.camel.StreamCache;
+import org.apache.camel.component.jetty.JettyContentExchange;
+import org.apache.camel.component.jetty.JettyHttpBinding;
import org.apache.camel.support.builder.OutputStreamBuilder;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.Request;
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent9.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
similarity index 95%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent9.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
index 0013ee1..2a17813 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent9.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty;
+package org.apache.camel.component.jetty9;
import java.net.URI;
import java.net.URISyntaxException;
@@ -23,6 +23,9 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.RuntimeCamelException;
+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.spi.annotations.Component;
import org.apache.camel.support.PropertyBindingSupport;
import org.eclipse.jetty.client.HttpClientTransport;
@@ -51,7 +54,7 @@ public class JettyHttpComponent9 extends JettyHttpComponent {
protected JettyHttpEndpoint createEndpoint(URI endpointUri, URI httpUri) throws URISyntaxException {
return new JettyHttpEndpoint9(this, endpointUri.toString(), httpUri);
}
-
+
@Override
protected AbstractConnector createConnectorJettyInternal(Server server,
JettyHttpEndpoint endpoint,
@@ -78,8 +81,8 @@ public class JettyHttpComponent9 extends JettyHttpComponent {
}
if (useXForwardedForHeader) {
httpConfig.addCustomizer(new ForwardedRequestCustomizer());
- }
- HttpConnectionFactory httpFactory = new org.eclipse.jetty.server.HttpConnectionFactory(httpConfig);
+ }
+ HttpConnectionFactory httpFactory = new org.eclipse.jetty.server.HttpConnectionFactory(httpConfig);
ArrayList<ConnectionFactory> connectionFactories = new ArrayList<>();
ServerConnector result = new org.eclipse.jetty.server.ServerConnector(server);
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint9.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
similarity index 89%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint9.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
index 9fe43da..3425065 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint9.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
@@ -14,13 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty;
+package org.apache.camel.component.jetty9;
import java.net.URI;
import java.net.URISyntaxException;
import org.apache.camel.AsyncEndpoint;
+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.http.common.HttpBinding;
+import org.apache.camel.http.common.HttpConsumer;
import org.apache.camel.spi.UriEndpoint;
/**
@@ -40,7 +44,7 @@ public class JettyHttpEndpoint9 extends JettyHttpEndpoint implements AsyncEndpoi
@Override
public HttpBinding getHttpBinding() {
- // make sure we include jetty variant of the http binding
+ // make sure we include jetty9 variant of the http binding
if (this.binding == null) {
this.binding = new AttachmentHttpBinding();
this.binding.setTransferException(isTransferException());
@@ -61,9 +65,9 @@ public class JettyHttpEndpoint9 extends JettyHttpEndpoint implements AsyncEndpoi
super.setHttpBinding(binding);
this.binding = binding;
}
-
+
@Override
public JettyContentExchange createContentExchange() {
return new JettyContentExchange9();
- }
+ }
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
index 820f920..b75cd0d 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
@@ -103,4 +103,9 @@ public abstract class BaseJettyTest extends CamelTestSupport {
jetty.setHeaderFilterStrategy(filterStrat);
}
+ protected boolean isJetty8() {
+ String majorVersion = Server.getVersion().split("\\.")[0];
+ return "8".equals(majorVersion);
+ }
+
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSendEmptyHeaderTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSendEmptyHeaderTest.java
index db37ed7..07abdd7 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSendEmptyHeaderTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSendEmptyHeaderTest.java
@@ -31,8 +31,10 @@ public class HttpProducerSendEmptyHeaderTest extends BaseJettyTest {
public void testHttpProducerSendEmptyHeader() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
-
- mock.expectedHeaderReceived("foo", null);
+
+ // Jetty 8 treats an empty header as "" while Jetty 9 treats it as null
+ String expectedValue = isJetty8() ? "" : null;
+ mock.expectedHeaderReceived("foo", expectedValue);
template.sendBodyAndHeader("http://localhost:{{port}}/myapp/mytest", "Hello World", "foo", "");
diff --git a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.xml b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.xml
index 99fcc15..e68b098 100644
--- a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.xml
+++ b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.xml
@@ -24,7 +24,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="jetty2" class="org.apache.camel.component.jetty.JettyHttpComponent9">
+ <bean id="jetty2" class="org.apache.camel.component.jetty9.JettyHttpComponent9">
<property name="enableJmx" value="true"/>
<property name="minThreads" value="10"/>
<property name="maxThreads" value="50"/>
diff --git a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-https.xml b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-https.xml
index 576650c..604abf2 100644
--- a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-https.xml
+++ b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-https.xml
@@ -23,7 +23,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="jetty" class="org.apache.camel.component.jetty.JettyHttpComponent9">
+ <bean id="jetty" class="org.apache.camel.component.jetty9.JettyHttpComponent9">
<property name="sslPassword" value="changeit"/>
<property name="sslKeyPassword" value="changeit"/>
<property name="keystore" value="src/test/resources/jsse/localhost.ks"/>
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index dcf6a02..2932aee 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -54,22 +54,22 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -169,19 +169,19 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-proxy</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
index 14664ef..80263e0 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
@@ -170,19 +170,19 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-proxy</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/examples/camel-example-cdi-rest-servlet/pom.xml b/examples/camel-example-cdi-rest-servlet/pom.xml
index 4213dca..e5115eb 100644
--- a/examples/camel-example-cdi-rest-servlet/pom.xml
+++ b/examples/camel-example-cdi-rest-servlet/pom.xml
@@ -142,7 +142,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-deploy</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
<scope>runtime</scope>
</dependency>
@@ -158,13 +158,13 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -189,7 +189,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
</plugin>
</plugins>
</build>
diff --git a/examples/camel-example-servlet-tomcat/pom.xml b/examples/camel-example-servlet-tomcat/pom.xml
index 3e1c77e..07a6558 100644
--- a/examples/camel-example-servlet-tomcat/pom.xml
+++ b/examples/camel-example-servlet-tomcat/pom.xml
@@ -88,7 +88,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
<configuration>
<webApp>
<contextPath>/${project.artifactId}</contextPath>
diff --git a/parent/pom.xml b/parent/pom.xml
index 5c5a702..673f31c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -342,7 +342,8 @@
<jedis-client-version>2.9.0</jedis-client-version>
<jedis-client-bundle-version>2.9.0_1</jedis-client-bundle-version>
<jersey-version>2.28</jersey-version>
- <jetty-version>9.4.19.v20190610</jetty-version>
+ <jetty9-version>9.4.19.v20190610</jetty9-version>
+ <jetty-version>${jetty9-version}</jetty-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
<jettison-version>1.4.0</jettison-version>
diff --git a/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty/springboot/JettyHttpComponentAutoConfiguration9.java b/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java
similarity index 98%
rename from platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty/springboot/JettyHttpComponentAutoConfiguration9.java
rename to platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java
index b95c77f..6d5b2ef 100644
--- a/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty/springboot/JettyHttpComponentAutoConfiguration9.java
+++ b/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty.springboot;
+package org.apache.camel.component.jetty9.springboot;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Generated;
import org.apache.camel.CamelContext;
-import org.apache.camel.component.jetty.JettyHttpComponent9;
+import org.apache.camel.component.jetty9.JettyHttpComponent9;
import org.apache.camel.spi.ComponentCustomizer;
import org.apache.camel.spi.HasId;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
diff --git a/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty/springboot/JettyHttpComponentConfiguration9.java b/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
similarity index 99%
rename from platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty/springboot/JettyHttpComponentConfiguration9.java
rename to platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
index cb5b3b4..e135dd9 100644
--- a/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty/springboot/JettyHttpComponentConfiguration9.java
+++ b/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty.springboot;
+package org.apache.camel.component.jetty9.springboot;
import java.util.Map;
import javax.annotation.Generated;
diff --git a/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/resources/META-INF/spring.factories
index 37c0327..6a3a401 100644
--- a/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,4 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.jetty.springboot.JettyHttpComponentAutoConfiguration9
+org.apache.camel.component.jetty9.springboot.JettyHttpComponentAutoConfiguration9
diff --git a/tests/camel-performance/pom.xml b/tests/camel-performance/pom.xml
index a4c3b0f3..9076291 100644
--- a/tests/camel-performance/pom.xml
+++ b/tests/camel-performance/pom.xml
@@ -125,25 +125,25 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
<scope>test</scope>
</dependency>
<dependency>
[camel] 02/02: Reflect reverting on MIGRATION guide
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 44b739bf06adb539d3b0e28ba76f9b124eb32945
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 19 09:27:19 2019 +0200
Reflect reverting on MIGRATION guide
---
MIGRATION.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index a6bff77..19f3d7f 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -136,7 +136,7 @@ The `quartz2` component has been renamed to `quartz`, and it's corresponding com
The `rxjava2` component has been renamed to `rxjava`, and it's corresponding component package from `org.apache.camel.component.rxjava2` to `org.apache.camel.component.rxjava`.
-We have also renamed `camel-jetty9` to `camel-jetty`, and it's corresponding component package from `org.apache.camel.component.jetty9` to `org.apache.camel.component.jetty`.
+We have also renamed `camel-jetty9` to `camel-jetty`. The supported scheme is now `jetty`.
### Tracing