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

tagbangers · Mar 2, 2017 · f7f7c4a · f7f7c4a
2 parents 8d00b13 + bce96fb
commit f7f7c4a
Show file tree

Hide file tree

Showing 8 changed files with 97 additions and 90 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.M13</version>
+	<version>1.0.0.M14</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.M13</version>
+				<version>1.0.0.M14</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.M13</version>
+        <version>1.0.0.M14</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.M13</version>
+		<version>1.0.0.M14</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>wallride-core</artifactId>

diff --git a/wallride-core/src/main/java/org/wallride/autoconfigure/WebGuestConfiguration.java b/wallride-core/src/main/java/org/wallride/autoconfigure/WebGuestConfiguration.java
@@ -40,10 +40,7 @@
 public class WebGuestConfiguration extends DelegatingWebMvcConfiguration {
 
 	@Autowired
-	private BlogService blogService;
-
-	@Autowired
-	private PageService pageService;
+	private PageDescribeController pageDescribeController;
 
 	@Override
 	public RequestMappingHandlerMapping requestMappingHandlerMapping() {
@@ -55,7 +52,7 @@ public RequestMappingHandlerMapping requestMappingHandlerMapping() {
 	@Override
 	protected RequestMappingHandlerMapping createRequestMappingHandlerMapping() {
 		RequestMappingHandlerMapping handlerMapping = super.createRequestMappingHandlerMapping();
-		handlerMapping.setDefaultHandler(pageDescribeController());
+		handlerMapping.setDefaultHandler(pageDescribeController);
 		return handlerMapping;
 	}
 
@@ -64,83 +61,91 @@ protected RequestMappingHandlerAdapter createRequestMappingHandlerAdapter() {
 		return super.createRequestMappingHandlerAdapter();
 	}
 
-	// Controllers
-
-	@Bean
-	@ConditionalOnMissingBean
-	public PageDescribeController pageDescribeController() {
-		return new PageDescribeController(blogService, pageService);
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public ArticleDescribeController articleDescribeController() {
-		return new ArticleDescribeController();
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public ArticleIndexController articleIndexController() {
-		return new ArticleIndexController();
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public CommentRestController commentRestController() {
-		return new CommentRestController();
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public LoginController loginController() {
-		return new LoginController();
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public PasswordResetController passwordResetController() {
-		return new PasswordResetController();
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public PasswordUpdateController passwordUpdateController() {
-		return new PasswordUpdateController();
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public ProfileUpdateController profileUpdateController() {
-		return new ProfileUpdateController();
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public SignupController signupController() {
-		return new SignupController();
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public FeedController feedController() {
-		return new FeedController();
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public IndexController indexController() {
-		return new IndexController();
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public SearchController searchController() {
-		return new SearchController();
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public TagController tagController() {
-		return new TagController();
+	@Configuration
+	public static class ControllerConfigration {
+
+		@Autowired
+		private BlogService blogService;
+
+		@Autowired
+		private PageService pageService;
+
+		@Bean
+		@ConditionalOnMissingBean
+		public PageDescribeController pageDescribeController() {
+			return new PageDescribeController(blogService, pageService);
+		}
+
+		@Bean
+		@ConditionalOnMissingBean
+		public ArticleDescribeController articleDescribeController() {
+			return new ArticleDescribeController();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean
+		public ArticleIndexController articleIndexController() {
+			return new ArticleIndexController();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean
+		public CommentRestController commentRestController() {
+			return new CommentRestController();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean
+		public LoginController loginController() {
+			return new LoginController();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean
+		public PasswordResetController passwordResetController() {
+			return new PasswordResetController();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean
+		public PasswordUpdateController passwordUpdateController() {
+			return new PasswordUpdateController();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean
+		public ProfileUpdateController profileUpdateController() {
+			return new ProfileUpdateController();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean
+		public SignupController signupController() {
+			return new SignupController();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean
+		public FeedController feedController() {
+			return new FeedController();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean
+		public IndexController indexController() {
+			return new IndexController();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean
+		public SearchController searchController() {
+			return new SearchController();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean
+		public TagController tagController() {
+			return new TagController();
+		}
 	}
 }
diff --git a/...ore/src/main/java/org/wallride/web/controller/admin/article/ArticlePreviewController.java b/...ore/src/main/java/org/wallride/web/controller/admin/article/ArticlePreviewController.java
@@ -75,6 +75,7 @@ public void preview(
 			HttpServletRequest request,
 			HttpServletResponse response) throws Exception {
 		Article article = new Article();
+		article.setLanguage(language);
 		article.setCover(form.getCoverId() != null ? mediaService.getMedia(form.getCoverId()) : null);
 		article.setTitle(form.getTitle());
 		article.setBody(form.getBody());

diff --git a/...ride-core/src/main/java/org/wallride/web/controller/admin/page/PagePreviewController.java b/...ride-core/src/main/java/org/wallride/web/controller/admin/page/PagePreviewController.java
@@ -76,6 +76,7 @@ public void preview(
 			HttpServletRequest request,
 			HttpServletResponse response) throws Exception {
 		Page page = new Page();
+		page.setLanguage(language);
 		page.setCover(form.getCoverId() != null ? mediaService.getMedia(form.getCoverId()) : null);
 		page.setTitle(form.getTitle());
 		page.setBody(form.getBody());

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.M13</version>
+    <version>1.0.0.M14</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.M13</version>
+            <version>1.0.0.M14</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.M13</version>
+        <version>1.0.0.M14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>wallride-tools</artifactId>