migration of modules:

spring-zuul
spring-vertx
spring-sleuth
This commit is contained in:
geroza 2018-12-22 10:30:08 -02:00
parent dcc054d6de
commit cb4470edea
9 changed files with 31 additions and 17 deletions

View File

@ -7,7 +7,8 @@
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>spring-remoting</name>
<description>Parent for all projects related to Spring Remoting.</description>
<description>Parent for all projects related to Spring Remoting, except remoting-hessian-burlap</description>
<!-- remoting-hessian-burlap needs to stick to spring-boot-1, some classes were removed in spring 5 -->
<parent>
<artifactId>parent-boot-2</artifactId>
@ -28,8 +29,8 @@
</dependencyManagement>
<modules>
<module>remoting-http</module>
<module>remoting-hessian-burlap</module>
<module>remoting-http</module>
<module>remoting-amqp</module>
<module>remoting-jms</module>
<module>remoting-rmi</module>

View File

@ -6,11 +6,13 @@
<artifactId>remoting-hessian-burlap</artifactId>
<packaging>pom</packaging>
<name>remoting-hessian-burlap</name>
<version>1.0-SNAPSHOT</version>
<parent>
<artifactId>spring-remoting</artifactId>
<artifactId>parent-boot-1</artifactId>
<groupId>com.baeldung</groupId>
<version>1.0-SNAPSHOT</version>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-1</relativePath>
</parent>
<modules>

View File

@ -1,7 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung</groupId>
<artifactId>spring-zuul</artifactId>
<version>1.0.0-SNAPSHOT</version>
@ -38,11 +39,22 @@
<properties>
<!-- Spring -->
<spring-cloud.version>1.2.7.RELEASE</spring-cloud.version>
<spring-cloud.version>2.1.0.RC3</spring-cloud.version>
<!-- util -->
<commons-lang3.version>3.5</commons-lang3.version>
<!-- Maven plugins -->
<maven-war-plugin.version>2.6</maven-war-plugin.version>
</properties>
<repositories>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>http://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
</project>

View File

@ -2,7 +2,7 @@ package org.baeldung.config;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@SpringBootApplication
public class ResourceServerApplication extends SpringBootServletInitializer {

View File

@ -3,11 +3,11 @@ package org.baeldung.config;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
@EnableWebMvc
@ComponentScan({ "org.baeldung.web.controller" })
public class ResourceServerWebConfig extends WebMvcConfigurerAdapter {
public class ResourceServerWebConfig implements WebMvcConfigurer {
}

View File

@ -1,2 +1,2 @@
server.contextPath=/spring-zuul-foos-resource
server.port=8081
server.servlet.context-path=/spring-zuul-foos-resource
server.port=8081

View File

@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-zuul</artifactId>
<artifactId>spring-cloud-starter-netflix-zuul</artifactId>
<version>${spring-cloud.version}</version>
</dependency>
<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-netflix-core</artifactId> <version>1.0.4.RELEASE</version> </dependency> -->

View File

@ -2,7 +2,7 @@ package org.baeldung.config;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
@EnableZuulProxy

View File

@ -7,11 +7,11 @@ import org.springframework.web.servlet.config.annotation.DefaultServletHandlerCo
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
@EnableWebMvc
public class UiWebConfig extends WebMvcConfigurerAdapter {
public class UiWebConfig implements WebMvcConfigurer {
@Bean
public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
@ -25,7 +25,6 @@ public class UiWebConfig extends WebMvcConfigurerAdapter {
@Override
public void addViewControllers(final ViewControllerRegistry registry) {
super.addViewControllers(registry);
registry.addViewController("/").setViewName("forward:/index");
registry.addViewController("/index");
registry.addViewController("/login");