From 61b0a46c84713ca3b5c191b14c8e1e00aaa4ec21 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <daniel.gerhardt@mni.thm.de>
Date: Tue, 27 May 2014 18:30:36 +0200
Subject: [PATCH] Rename configuration property for consistency

---
 .../java/de/thm/arsnova/controller/ConfigurationController.java | 2 +-
 src/main/webapp/arsnova.properties.example                      | 2 +-
 src/test/resources/arsnova.properties.example                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index ab137e017..37d873bbd 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -72,7 +72,7 @@ public class ConfigurationController extends AbstractController {
 	@Value("${features.question-format.grid-square.enabled:false}")
 	private String gridSquareEnabled;
 
-	@Value("${question.answerOptionLimit:8}")
+	@Value("${question.answer-option-limit:8}")
 	private String answerOptionLimit;
 
 	@Value("${question.parse-answer-option-formatting:false}")
diff --git a/src/main/webapp/arsnova.properties.example b/src/main/webapp/arsnova.properties.example
index 1f76e549b..9d37439e9 100644
--- a/src/main/webapp/arsnova.properties.example
+++ b/src/main/webapp/arsnova.properties.example
@@ -168,7 +168,7 @@ feedback.cleanup=10
 upload.filesize_b=1048576
 
 # maximal number of answer options allowed for a skill question
-question.answerOptionLimit=8
+question.answer-option-limit=8
 
 # Enable Markdown and MathJax parsing in answer options. Formatting in answer
 # options should be used cautiously since it could lead to display errors.
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index 1f76e549b..9d37439e9 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -168,7 +168,7 @@ feedback.cleanup=10
 upload.filesize_b=1048576
 
 # maximal number of answer options allowed for a skill question
-question.answerOptionLimit=8
+question.answer-option-limit=8
 
 # Enable Markdown and MathJax parsing in answer options. Formatting in answer
 # options should be used cautiously since it could lead to display errors.
-- 
GitLab