cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Removing one of 3 SpringBoot demo apps
Date Mon, 09 May 2016 15:15:44 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes fa96525a1 -> de3464abe


Removing one of 3 SpringBoot demo apps


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/de3464ab
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/de3464ab
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/de3464ab

Branch: refs/heads/3.1.x-fixes
Commit: de3464abe2f6e0a9de6532c3831f558907e6a193
Parents: fa96525
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Mon May 9 16:13:05 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Mon May 9 16:14:58 2016 +0100

----------------------------------------------------------------------
 .../rs/service/SampleScanRestApplication2.java  | 74 --------------------
 1 file changed, 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/de3464ab/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
deleted file mode 100644
index fe166ad..0000000
--- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication2.java
+++ /dev/null
@@ -1,74 +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 java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.servlet.ServletConfig;
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
-
-import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
-import org.apache.cxf.jaxrs.spring.JaxRsConfig;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
-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 {
-    public static void main(String[] args) {
-        SpringApplication.run(SampleScanRestApplication2.class, args);
-    }
- 
-    @Bean
-    public ServletRegistrationBean servletRegistrationBean(ApplicationContext context) {
-        Application app = (Application)context.getBean("helloApp");
-        @SuppressWarnings("serial")
-        CXFNonSpringJaxrsServlet servlet = new CXFNonSpringJaxrsServlet(app) {
-            @Override
-            protected boolean isIgnoreApplicationPath(ServletConfig servletConfig) {
-                return false;
-            }
-            
-        };
-        return new ServletRegistrationBean(servlet, "/*");
-    }
- 
-    
-    @Bean
-    public Application helloApp() {
-        return new JaxrsApplication();
-    }
-
-    @ApplicationPath("/services/helloservice")
-    public static class JaxrsApplication extends Application { 
-        public Set<Object> getSingletons() {
-            return new HashSet<Object>(Arrays.asList(new HelloService(), new HelloService2()));
-        }
-    }
-    
-}


Mime
View raw message