This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 3b915e5 CAMEL-14060: Remove camel-restlet 3b915e5 is described below commit 3b915e5a4aeb50c3fd724df64cafff7aa6a3ad92 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Wed Oct 16 16:35:40 2019 +0200 CAMEL-14060: Remove camel-restlet --- ...pache.camel.component.aws.xray.SegmentDecorator | 1 - .../org.apache.camel.opentracing.SpanDecorator | 1 - .../sparkrest/RestCamelSparkPojoInOutTest.java | 52 ---------------------- docs/user-manual/modules/ROOT/pages/index.adoc | 1 - .../RestConfigurationDefinitionProperties.java | 2 +- .../camel/itest/karaf/CamelRestletGsonTest.java | 34 -------------- .../camel/itest/karaf/CamelRestletJacksonTest.java | 34 -------------- 7 files changed, 1 insertion(+), 124 deletions(-) diff --git a/components/camel-aws-xray/src/main/resources/META-INF/services/org.apache.camel.component.aws.xray.SegmentDecorator b/components/camel-aws-xray/src/main/resources/META-INF/services/org.apache.camel.component.aws.xray.SegmentDecorator index 7817575..da456b4 100644 --- a/components/camel-aws-xray/src/main/resources/META-INF/services/org.apache.camel.component.aws.xray.SegmentDecorator +++ b/components/camel-aws-xray/src/main/resources/META-INF/services/org.apache.camel.component.aws.xray.SegmentDecorator @@ -27,7 +27,6 @@ org.apache.camel.component.aws.xray.decorators.http.AhcSegmentDecorator org.apache.camel.component.aws.xray.decorators.http.HttpSegmentDecorator org.apache.camel.component.aws.xray.decorators.http.JettySegmentDecorator org.apache.camel.component.aws.xray.decorators.http.NettyHttpSegmentDecorator -org.apache.camel.component.aws.xray.decorators.http.RestletSegmentDecorator org.apache.camel.component.aws.xray.decorators.http.RestSegmentDecorator org.apache.camel.component.aws.xray.decorators.http.ServletSegmentDecorator org.apache.camel.component.aws.xray.decorators.http.UndertowSegmentDecorator diff --git a/components/camel-opentracing/src/main/resources/META-INF/services/org.apache.camel.opentracing.SpanDecorator b/components/camel-opentracing/src/main/resources/META-INF/services/org.apache.camel.opentracing.SpanDecorator index 194273a..a36d9b7 100644 --- a/components/camel-opentracing/src/main/resources/META-INF/services/org.apache.camel.opentracing.SpanDecorator +++ b/components/camel-opentracing/src/main/resources/META-INF/services/org.apache.camel.opentracing.SpanDecorator @@ -39,7 +39,6 @@ org.apache.camel.opentracing.decorators.MqttSpanDecorator org.apache.camel.opentracing.decorators.NettyHttpSpanDecorator org.apache.camel.opentracing.decorators.PahoSpanDecorator org.apache.camel.opentracing.decorators.RabbitmqSpanDecorator -org.apache.camel.opentracing.decorators.RestletSpanDecorator org.apache.camel.opentracing.decorators.RestSpanDecorator org.apache.camel.opentracing.decorators.SedaSpanDecorator org.apache.camel.opentracing.decorators.ServletSpanDecorator diff --git a/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/RestCamelSparkPojoInOutTest.java b/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/RestCamelSparkPojoInOutTest.java deleted file mode 100644 index 703d8c5..0000000 --- a/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/RestCamelSparkPojoInOutTest.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.sparkrest; - -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.model.rest.RestBindingMode; -import org.junit.Test; - -public class RestCamelSparkPojoInOutTest extends BaseSparkTest { - - @Test - public void testRestletPojoInOut() throws Exception { - String body = "{\"id\": 123, \"name\": \"Donald Duck\"}"; - String out = template.requestBody("http://localhost:" + getPort() + "/users/lives", body, String.class); - - assertNotNull(out); - assertEquals("{\"iso\":\"EN\",\"country\":\"England\"}", out); - } - - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - @Override - public void configure() throws Exception { - // configure to use spark on localhost with the given port - // and enable auto binding mode - restConfiguration().component("spark-rest").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto); - - // use the rest DSL to define the rest services - rest("/users/") - .post("lives").type(UserPojo.class).outType(CountryPojo.class) - .route() - .bean(new UserService(), "livesWhere"); - } - }; - } - -} diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc index 5e112e2..761431c 100644 --- a/docs/user-manual/modules/ROOT/pages/index.adoc +++ b/docs/user-manual/modules/ROOT/pages/index.adoc @@ -354,7 +354,6 @@ camel routes without them knowing ** xref:components::rabbitmq-component.adoc[RabbitMQ] ** xref:components::reactive-streams-component.adoc[Reactive Streams] ** xref:components::rest-swagger-component.adoc[REST Swagger] -** xref:components::restlet-component.adoc[Restlet] ** xref:components::rss-component.adoc[RSS] ** xref:components::salesforce-component.adoc[Salesforce] ** xref:components::sap-netweaver-component.adoc[SAP NetWeaver] diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionProperties.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionProperties.java index bcdb1f7..7cebfff 100644 --- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionProperties.java +++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionProperties.java @@ -33,7 +33,7 @@ public class RestConfigurationDefinitionProperties { /** * The Camel Rest component to use for the REST transport (consumer), such - * as restlet, spark-rest. If no component has been explicit configured, + * as netty-http, jetty, servlet, undertow. If no component has been explicit configured, * then Camel will lookup if there is a Camel component that integrates with * the Rest DSL, or if a org.apache.camel.spi.RestConsumerFactory is * registered in the registry. If either one is found, then that is being diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletGsonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletGsonTest.java deleted file mode 100644 index c76cebf..0000000 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletGsonTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.itest.karaf; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.PaxExam; - -@RunWith(PaxExam.class) -public class CamelRestletGsonTest extends BaseKarafTest { - - public static final String COMPONENT = extractName(CamelRestletGsonTest.class); - - @Test - public void test() throws Exception { - installCamelFeature(COMPONENT); - } - - -} \ No newline at end of file diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletJacksonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletJacksonTest.java deleted file mode 100644 index fdc0991..0000000 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletJacksonTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.itest.karaf; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.PaxExam; - -@RunWith(PaxExam.class) -public class CamelRestletJacksonTest extends BaseKarafTest { - - public static final String COMPONENT = extractName(CamelRestletJacksonTest.class); - - @Test - public void test() throws Exception { - installCamelFeature(COMPONENT); - } - - -} \ No newline at end of file