SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove executable jar from distribution

Browse Source 
It doesn't get used much and it has way too many optional dependencies
in it now.
This commit is contained in:
Dave Syer
2015-11-05 07:12:45 +01:00
parent e9ef01bb95
commit 15b5ca804e
5 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerApplication.java
View File

@@ -10,8 +10,8 @@ import org.springframework.context.annotation.Configuration;
public class ConfigServerApplication {
public static void main(String[] args) {
new SpringApplicationBuilder(ConfigServerApplication.class).properties(
"spring.config.name=configserver", "debug=true").run(args);
new SpringApplicationBuilder(ConfigServerApplication.class)
.properties("spring.config.name=configserver").run(args);
}
}

21
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerMvcConfiguration.java
View File

@@ -25,6 +25,9 @@ import org.springframework.cloud.config.server.resource.ResourceController;
import org.springframework.cloud.config.server.resource.ResourceRepository;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType;
import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
/**
* @author Dave Syer
@@ -32,7 +35,8 @@ import org.springframework.context.annotation.Configuration;
*/
@Configuration
@ConditionalOnWebApplication
public class ConfigServerMvcConfiguration {
public class ConfigServerMvcConfiguration extends WebMvcConfigurerAdapter {
@Autowired
private EnvironmentRepository repository;
@@ -42,9 +46,16 @@ public class ConfigServerMvcConfiguration {
@Autowired
private ConfigServerProperties server;
@Autowired(required=false)
@Autowired(required = false)
private EnvironmentEncryptor environmentEncryptor;
@Override
public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
configurer.mediaType("properties", MediaType.valueOf("text/plain"));
configurer.mediaType("yml", MediaType.valueOf("text/yaml"));
configurer.mediaType("yaml", MediaType.valueOf("text/yaml"));
}
@Bean
public EnvironmentController environmentController() {
EnvironmentController controller = new EnvironmentController(encrypted());
@@ -54,12 +65,14 @@ public class ConfigServerMvcConfiguration {
@Bean
public ResourceController resourceController() {
ResourceController controller = new ResourceController(this.resources, encrypted());
ResourceController controller = new ResourceController(this.resources,
encrypted());
return controller;
}
private EnvironmentEncryptorEnvironmentRepository encrypted() {
EnvironmentEncryptorEnvironmentRepository encrypted = new EnvironmentEncryptorEnvironmentRepository(this.repository, this.environmentEncryptor);
EnvironmentEncryptorEnvironmentRepository encrypted = new EnvironmentEncryptorEnvironmentRepository(
this.repository, this.environmentEncryptor);
encrypted.setOverrides(this.server.getOverrides());
return encrypted;
}