cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6869] Removing SampleScanRestApplication from the jaxrs demo
Date Sun, 29 May 2016 16:31:20 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes a9e7837d7 -> fba651387


[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/fba65138
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fba65138
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fba65138

Branch: refs/heads/3.1.x-fixes
Commit: fba651387907a07d02750de647aa54ed8dd623cb
Parents: a9e7837
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Sun May 29 17:25:34 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Sun May 29 17:30:54 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/fba65138/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 e9f3556..9b9050b 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/fba65138/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/fba65138/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();
-    }
-    
-}


Mime
View raw message