You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2016/05/31 00:36:54 UTC
[04/17] cxf git commit: [CXF-6869] Removing SampleScanRestApplication
from the jaxrs demo
[CXF-6869] Removing SampleScanRestApplication from the jaxrs demo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b97c78fd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b97c78fd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b97c78fd
Branch: refs/heads/master-jaxrs-2.1
Commit: b97c78fd35139124d691758fe1676040194c0bdf
Parents: e95c92a
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Sun May 29 17:25:34 2016 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Sun May 29 17:25:34 2016 +0100
----------------------------------------------------------------------
.../samples/jax_rs/jaxrs_spring_boot/pom.xml | 3 --
.../rs/service/SampleRestApplication.java | 2 +-
.../rs/service/SampleScanRestApplication.java | 42 --------------------
3 files changed, 1 insertion(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b97c78fd/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml
index d6762f8..82d07b9 100644
--- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml
@@ -55,9 +55,6 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>sample.rs.service.SampleRestApplication</mainClass>
- <!--
- <mainClass>sample.rs.service.SampleScanRestApplication</mainClass>
- -->
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/cxf/blob/b97c78fd/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 c2cbc7d..c5ffb8e 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
@@ -39,7 +39,7 @@ public class SampleRestApplication {
public Server rsServer() {
JAXRSServerFactoryBean endpoint = new JAXRSServerFactoryBean();
endpoint.setServiceBeans(Arrays.asList(new HelloService(), new HelloService2()));
- endpoint.setAddress("/helloservice");
+ endpoint.setAddress("/");
endpoint.setFeatures(Arrays.asList(new Swagger2Feature()));
return endpoint.create();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/b97c78fd/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
deleted file mode 100644
index 9f79c23..0000000
--- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication.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 org.apache.cxf.jaxrs.spring.SpringComponentScanServer;
-import org.apache.cxf.jaxrs.swagger.Swagger2Feature;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
-
-@SpringBootApplication
-@Import(SpringComponentScanServer.class)
-public class SampleScanRestApplication {
- public static void main(String[] args) {
- SpringApplication.run(SampleScanRestApplication.class, args);
- }
-
- @Bean
- public Swagger2Feature swaggerFeature(ApplicationContext context) {
- // Or create a simple Swagger2Feature @Component-annotated extension
- // and drop this method if a default feature setup is OK
- return new Swagger2Feature();
- }
-
-}