Merge branch 'develop' of https://github.com/tagbangers/wallride

tagbangers · Feb 22, 2017 · d343791 · d343791
2 parents b54272b + 90beace
commit d343791
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 	<groupId>org.wallride</groupId>
 	<artifactId>wallride</artifactId>
-	<version>1.0.0.M11</version>
+	<version>1.0.0.M12</version>
 	<packaging>pom</packaging>
 	<name>WallRide</name>
 	<description>CMS for developers of principles</description>
@@ -80,7 +80,7 @@
 			<dependency>
 				<groupId>org.wallride</groupId>
 				<artifactId>wallride-core</artifactId>
-				<version>1.0.0.M11</version>
+				<version>1.0.0.M12</version>
 			</dependency>
 
 			<!-- Spring -->

diff --git a/wallride-bootstrap/pom.xml b/wallride-bootstrap/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.wallride</groupId>
         <artifactId>wallride-parent</artifactId>
-        <version>1.0.0.M11</version>
+        <version>1.0.0.M12</version>
         <relativePath>../wallride-parent/pom.xml</relativePath>
     </parent>
     <artifactId>wallride-bootstrap</artifactId>

diff --git a/wallride-core/pom.xml b/wallride-core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.wallride</groupId>
 		<artifactId>wallride</artifactId>
-		<version>1.0.0.M11</version>
+		<version>1.0.0.M12</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>wallride-core</artifactId>

diff --git a/...ide-core/src/main/java/org/wallride/autoconfigure/WallRideMessageSourceConfiguration.java b/...ide-core/src/main/java/org/wallride/autoconfigure/WallRideMessageSourceConfiguration.java
@@ -5,22 +5,21 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.MessageSourceAccessor;
-import org.springframework.context.support.ReloadableResourceBundleMessageSource;
+import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.validation.DefaultMessageCodesResolver;
 import org.springframework.validation.MessageCodesResolver;
 
 @Configuration
 public class WallRideMessageSourceConfiguration extends MessageSourceAutoConfiguration {
 
-	@Bean
+	@Override
 	public MessageSource messageSource() {
-		ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource();
-		messageSource.setDefaultEncoding("utf-8");
-		messageSource.setBasenames(
-				"classpath:/messages/messages",
-				"classpath:/messages/validations",
-				"classpath:/messages/enumerations",
-				"classpath:/messages/languages"
+		ResourceBundleMessageSource messageSource = (ResourceBundleMessageSource) super.messageSource();
+		messageSource.addBasenames(
+				"messages/messages",
+				"messages/validations",
+				"messages/enumerations",
+				"messages/languages"
 		);
 		return messageSource;
 	}

diff --git a/wallride-parent/pom.xml b/wallride-parent/pom.xml
@@ -11,7 +11,7 @@
     </parent>
     <groupId>org.wallride</groupId>
     <artifactId>wallride-parent</artifactId>
-    <version>1.0.0.M11</version>
+    <version>1.0.0.M12</version>
     <packaging>pom</packaging>
     <name>WallRide Parent</name>
     <description>CMS for developers of principles</description>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.wallride</groupId>
             <artifactId>wallride-core</artifactId>
-            <version>1.0.0.M11</version>
+            <version>1.0.0.M12</version>
         </dependency>
 
         <dependency>

diff --git a/wallride-tools/pom.xml b/wallride-tools/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.wallride</groupId>
         <artifactId>wallride</artifactId>
-        <version>1.0.0.M11</version>
+        <version>1.0.0.M12</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>wallride-tools</artifactId>