From 8f2bbd47bd11cc966b929cb85615ca33ce962a75 Mon Sep 17 00:00:00 2001
From: Zellweger Christof Ralf <christof.zellweger@psi.ch>
Date: Fri, 26 Jun 2015 15:19:43 +0200
Subject: [PATCH] ATEST-81: - renaming config so that all the configs follow
 the same naming patterns

---
 .../rest/config/{RestConfiguration.java => RestConfig.java}   | 4 ++--
 .../java/ch/psi/daq/test/rest/DaqWebMvcConfiguration.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename src/main/java/ch/psi/daq/rest/config/{RestConfiguration.java => RestConfig.java} (98%)

diff --git a/src/main/java/ch/psi/daq/rest/config/RestConfiguration.java b/src/main/java/ch/psi/daq/rest/config/RestConfig.java
similarity index 98%
rename from src/main/java/ch/psi/daq/rest/config/RestConfiguration.java
rename to src/main/java/ch/psi/daq/rest/config/RestConfig.java
index d904006..724ae67 100644
--- a/src/main/java/ch/psi/daq/rest/config/RestConfiguration.java
+++ b/src/main/java/ch/psi/daq/rest/config/RestConfig.java
@@ -32,9 +32,9 @@ import ch.psi.daq.rest.model.PropertyFilterMixin;
 @Configuration
 @PropertySource(value = { "classpath:rest.properties" })
 @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
    private Environment env;
diff --git a/src/test/java/ch/psi/daq/test/rest/DaqWebMvcConfiguration.java b/src/test/java/ch/psi/daq/test/rest/DaqWebMvcConfiguration.java
index 0ab6185..6f82463 100644
--- a/src/test/java/ch/psi/daq/test/rest/DaqWebMvcConfiguration.java
+++ b/src/test/java/ch/psi/daq/test/rest/DaqWebMvcConfiguration.java
@@ -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.WebMvcConfigurationSupport;
 
-import ch.psi.daq.rest.config.RestConfiguration;
+import ch.psi.daq.rest.config.RestConfig;
 import ch.psi.daq.test.cassandra.LocalCassandraTestConfig;
 
 @Configuration
@@ -16,7 +16,7 @@ import ch.psi.daq.test.cassandra.LocalCassandraTestConfig;
 //      "ch.psi.daq.cassandra.reader",
 //      "ch.psi.daq.cassandra.writer"
 //})
-@Import(value = {LocalCassandraTestConfig.class, RestConfiguration.class})
+@Import(value = {LocalCassandraTestConfig.class, RestConfig.class})
 @EnableWebMvc
 public class DaqWebMvcConfiguration extends WebMvcConfigurationSupport {