Merge branch 'develop' of https://github.com/mifosio/identity into develop
diff --git a/service/src/main/java/io/mifos/identity/config/IdentityServiceConfig.java b/service/src/main/java/io/mifos/identity/config/IdentityServiceConfig.java
index e5e32d0..8fe6a66 100644
--- a/service/src/main/java/io/mifos/identity/config/IdentityServiceConfig.java
+++ b/service/src/main/java/io/mifos/identity/config/IdentityServiceConfig.java
@@ -34,6 +34,8 @@
 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.PathMatchConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 @Configuration
 @EnableAutoConfiguration
@@ -52,7 +54,7 @@
     "io.mifos.identity.internal.repository",
     "io.mifos.identity.internal.command.handler"
 })
-public class IdentityServiceConfig {
+public class IdentityServiceConfig extends WebMvcConfigurerAdapter {
 
   public IdentityServiceConfig() {}
 
@@ -67,6 +69,11 @@
     return LoggerFactory.getLogger(IdentityConstants.LOGGER_NAME);
   }
 
+  @Override
+  public void configurePathMatch(final PathMatchConfigurer configurer) {
+    configurer.setUseSuffixPatternMatch(Boolean.FALSE);
+  }
+
   public static void main(String[] args) {
     SpringApplication.run(IdentityServiceConfig.class, args);
   }
diff --git a/service/src/main/resources/logback.xml b/service/src/main/resources/logback.xml
index ebae6a1..40a8cab 100644
--- a/service/src/main/resources/logback.xml
+++ b/service/src/main/resources/logback.xml
@@ -19,7 +19,7 @@
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>logs/identity.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>identity.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>logs/archive/identity.%d{yyyy-MM-dd}.log</fileNamePattern>
             <maxHistory>7</maxHistory>
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>