Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-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 75297183ED for ; Wed, 24 Feb 2016 17:33:43 +0000 (UTC) Received: (qmail 33534 invoked by uid 500); 24 Feb 2016 17:33:42 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 33394 invoked by uid 500); 24 Feb 2016 17:33:42 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 33314 invoked by uid 99); 24 Feb 2016 17:33:42 -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; Wed, 24 Feb 2016 17:33:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 09F6AE8EBB; Wed, 24 Feb 2016 17:33:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Moving spring boot demo service classes in two sibling packages to demo SwaggerFeature can correctly set up a base package Date: Wed, 24 Feb 2016 17:33:42 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 73198c5da -> d08ea7a76 Moving spring boot demo service classes in two sibling packages to demo SwaggerFeature can correctly set up a base package Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d08ea7a7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d08ea7a7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d08ea7a7 Branch: refs/heads/master Commit: d08ea7a76d639d0a1b6e846d48ece804d95ddb90 Parents: 73198c5 Author: Sergey Beryozkin Authored: Wed Feb 24 17:33:25 2016 +0000 Committer: Sergey Beryozkin Committed: Wed Feb 24 17:33:25 2016 +0000 ---------------------------------------------------------------------- .../rs/client/SampleRestClientApplication.java | 2 +- .../java/sample/rs/service/HelloService.java | 42 -------------------- .../java/sample/rs/service/HelloService2.java | 42 -------------------- .../rs/service/SampleRestApplication.java | 3 ++ .../rs/service/SampleScanRestApplication.java | 4 +- .../rs/service/SampleScanRestApplication2.java | 3 ++ .../sample/rs/service/hello1/HelloService.java | 42 ++++++++++++++++++++ .../sample/rs/service/hello2/HelloService2.java | 42 ++++++++++++++++++++ 8 files changed, 92 insertions(+), 88 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/d08ea7a7/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java index eeb2781..f015097 100644 --- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java +++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java @@ -20,7 +20,7 @@ package sample.rs.client; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; -import sample.rs.service.HelloService; +import sample.rs.service.hello1.HelloService; public final class SampleRestClientApplication { http://git-wip-us.apache.org/repos/asf/cxf/blob/d08ea7a7/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/HelloService.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/HelloService.java b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/HelloService.java deleted file mode 100644 index 069672d..0000000 --- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/HelloService.java +++ /dev/null @@ -1,42 +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 sample.rs.service; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -import org.springframework.stereotype.Service; - -import io.swagger.annotations.Api; - -@Path("/sayHello") -@Service -@Api("/sayHello") -public class HelloService { - - @GET - @Path("/{a}") - @Produces(MediaType.TEXT_PLAIN) - public String sayHello(@PathParam("a") String a) { - return "Hello " + a + ", Welcome to CXF RS Spring Boot World!!!"; - } - -} http://git-wip-us.apache.org/repos/asf/cxf/blob/d08ea7a7/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/HelloService2.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/HelloService2.java b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/HelloService2.java deleted file mode 100644 index 2421047..0000000 --- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/HelloService2.java +++ /dev/null @@ -1,42 +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 sample.rs.service; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -import org.springframework.stereotype.Service; - -import io.swagger.annotations.Api; - -@Path("/sayHello2") -@Service -@Api("/sayHello2") -public class HelloService2 { - - @GET - @Path("/{a}") - @Produces(MediaType.TEXT_PLAIN) - public String sayHello(@PathParam("a") String a) { - return "Hello2 " + a + ", Welcome to CXF RS Spring Boot World!!!"; - } - -} http://git-wip-us.apache.org/repos/asf/cxf/blob/d08ea7a7/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java index 8ee0d14..a22997b 100644 --- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java +++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java @@ -30,6 +30,9 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; +import sample.rs.service.hello1.HelloService; +import sample.rs.service.hello2.HelloService2; + @SpringBootApplication @Import(JaxRsConfig.class) public class SampleRestApplication { http://git-wip-us.apache.org/repos/asf/cxf/blob/d08ea7a7/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication.java b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication.java index 7567e0a..d97de58 100644 --- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication.java +++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication.java @@ -42,9 +42,7 @@ public class SampleScanRestApplication { public Swagger2Feature swaggerFeature(ApplicationContext context) { // Or create a simple Swagger2Feature @Component-annotated extension // and drop this method if a default feature setup is OK - Swagger2Feature feature = new Swagger2Feature(); - //feature.setRunAsFilter(true); - return feature; + return new Swagger2Feature(); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/d08ea7a7/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication2.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication2.java b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication2.java index 43c8d37..fe166ad 100644 --- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication2.java +++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication2.java @@ -34,6 +34,9 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; +import sample.rs.service.hello1.HelloService; +import sample.rs.service.hello2.HelloService2; + @SpringBootApplication @Import(JaxRsConfig.class) public class SampleScanRestApplication2 { http://git-wip-us.apache.org/repos/asf/cxf/blob/d08ea7a7/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/hello1/HelloService.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/hello1/HelloService.java b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/hello1/HelloService.java new file mode 100644 index 0000000..6672ecb --- /dev/null +++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/hello1/HelloService.java @@ -0,0 +1,42 @@ +/** + * 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 sample.rs.service.hello1; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +import org.springframework.stereotype.Service; + +import io.swagger.annotations.Api; + +@Path("/sayHello") +@Service +@Api("/sayHello") +public class HelloService { + + @GET + @Path("/{a}") + @Produces(MediaType.TEXT_PLAIN) + public String sayHello(@PathParam("a") String a) { + return "Hello " + a + ", Welcome to CXF RS Spring Boot World!!!"; + } + +} http://git-wip-us.apache.org/repos/asf/cxf/blob/d08ea7a7/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/hello2/HelloService2.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/hello2/HelloService2.java b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/hello2/HelloService2.java new file mode 100644 index 0000000..874e363 --- /dev/null +++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/hello2/HelloService2.java @@ -0,0 +1,42 @@ +/** + * 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 sample.rs.service.hello2; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +import org.springframework.stereotype.Service; + +import io.swagger.annotations.Api; + +@Path("/sayHello2") +@Service +@Api("/sayHello2") +public class HelloService2 { + + @GET + @Path("/{a}") + @Produces(MediaType.TEXT_PLAIN) + public String sayHello(@PathParam("a") String a) { + return "Hello2 " + a + ", Welcome to CXF RS Spring Boot World!!!"; + } + +}