v 1.5.0 RC2

v 1.5.0 RC2

maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java

@@ -120,24 +120,19 @@ public class MaxKeyConfig {
         return new SavedRequestAwareAuthenticationSuccessHandler();
     }
     
-    
-    @Value("${config.otp.keyuri.format.type:totp}")
-    String keyuriFormatType;
-    
-    @Value("${config.otp.keyuri.format.domain:MaxKey.top}")
-    String keyuriFormatDomain;
-    
-    @Value("${config.otp.keyuri.format.issuer:MaxKey}")
-    String keyuriFormatIssuer;
-    
-    @Value("${config.otp.keyuri.format.digits:6}")
-    int keyuriFormatDigits;
-    
-    @Value("${config.otp.keyuri.format.period:30}")
-    int keyuriFormatPeriod;
-    
     @Bean(name = "keyUriFormat")
-    public KeyUriFormat keyUriFormat() {
+    public KeyUriFormat keyUriFormat(
+            @Value("${config.otp.keyuri.format.type:totp}")
+            String keyuriFormatType,
+            @Value("${config.otp.keyuri.format.domain:MaxKey.top}")
+            String keyuriFormatDomain,
+            @Value("${config.otp.keyuri.format.issuer:MaxKey}")
+            String keyuriFormatIssuer,
+            @Value("${config.otp.keyuri.format.digits:6}")
+            int keyuriFormatDigits,
+            @Value("${config.otp.keyuri.format.period:30}")
+            int keyuriFormatPeriod) {
+        
         KeyUriFormat keyUriFormat=new KeyUriFormat();
         keyUriFormat.setType(keyuriFormatType);
         keyUriFormat.setDomain(keyuriFormatDomain);

maxkey-web-maxkey/src/main/resources/spring/maxkey.xml

@@ -17,17 +17,6 @@
 	        http://www.springframework.org/schema/util/spring-util.xsd
 	        http://www.springframework.org/schema/mvc 
 	        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-    
-    <!-- Application properties configs  -->
-	<bean id="propertySourcesPlaceholderConfigurer" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
-	  <property name="locations">
-	    <list>
-	   	  <value>classpath:config/applicationConfig.properties</value>
-	   	  <value>classpath:application.properties</value>
-	    </list>
-	  </property>
-	  <property name="ignoreUnresolvablePlaceholders" value="true"/>
-	</bean>
 	
 	<!-- Scans the classpath for annotated components that will be auto-registered as Spring beans.
  	 @Controller and @Service. Make sure to set the correct base-package-->