ITQC/gls_docs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ATEST-81:

Browse Source 
- renaming config so that all the configs follow the same naming
patterns
This commit is contained in:
Zellweger Christof Ralf
2015-06-26 15:19:43 +02:00
parent b79d2c5107
commit 8f2bbd47bd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/ch/psi/daq/rest/config/RestConfiguration.java → src/main/java/ch/psi/daq/rest/config/RestConfig.java
View File

@ -32,9 +32,9 @@ import ch.psi.daq.rest.model.PropertyFilterMixin;
@Configuration @Configuration
@PropertySource(value = { "classpath:rest.properties" }) @PropertySource(value = { "classpath:rest.properties" })
@PropertySource(value = { "file:${user.home}/.config/daq/rest.properties" }, ignoreResourceNotFound = true) @PropertySource(value = { "file:${user.home}/.config/daq/rest.properties" }, ignoreResourceNotFound = true)
public class RestConfiguration { public class RestConfig {
private static final Logger logger = LoggerFactory.getLogger(RestConfiguration.class); private static final Logger logger = LoggerFactory.getLogger(RestConfig.class);
@Autowired @Autowired
private Environment env; private Environment env;

4
src/test/java/ch/psi/daq/test/rest/DaqWebMvcConfiguration.java
View File

@ -5,7 +5,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
import ch.psi.daq.rest.config.RestConfiguration; import ch.psi.daq.rest.config.RestConfig;
import ch.psi.daq.test.cassandra.LocalCassandraTestConfig; import ch.psi.daq.test.cassandra.LocalCassandraTestConfig;
@Configuration @Configuration
@ -16,7 +16,7 @@ import ch.psi.daq.test.cassandra.LocalCassandraTestConfig;
// "ch.psi.daq.cassandra.reader", // "ch.psi.daq.cassandra.reader",
// "ch.psi.daq.cassandra.writer" // "ch.psi.daq.cassandra.writer"
//}) //})
@Import(value = {LocalCassandraTestConfig.class, RestConfiguration.class}) @Import(value = {LocalCassandraTestConfig.class, RestConfig.class})
@EnableWebMvc @EnableWebMvc
public class DaqWebMvcConfiguration extends WebMvcConfigurationSupport { public class DaqWebMvcConfiguration extends WebMvcConfigurationSupport {