From ef0d93d8be965c93ef57a347566eb7e0eed6e5da Mon Sep 17 00:00:00 2001
From: Daniel Vogel <daniel.vogel@mni.thm.de>
Date: Wed, 19 Mar 2014 00:36:38 +0100
Subject: [PATCH] Deleted question attribute chosenField. Grid questions now
also use possibleAnswers
---
.../java/de/thm/arsnova/dao/CouchDBDao.java | 2 --
.../de/thm/arsnova/entities/Question.java | 9 ------
src/main/webapp/arsnova.properties | 31 +++++++++++++++++++
3 files changed, 31 insertions(+), 11 deletions(-)
create mode 100644 src/main/webapp/arsnova.properties
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 7bdcb607..1e3915e9 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -293,7 +293,6 @@ public class CouchDBDao implements IDatabaseDao {
q.put("offsetX", question.getOffsetX());
q.put("offsetY", question.getOffsetY());
q.put("zoomLvl", question.getZoomLvl());
- q.put("chosenFields", question.getChosenFields());
return q;
}
@@ -317,7 +316,6 @@ public class CouchDBDao implements IDatabaseDao {
q.put("offsetX", question.getOffsetX());
q.put("offsetY", question.getOffsetY());
q.put("zoomLvl", question.getZoomLvl());
- q.put("chosenFields", question.getChosenFields());
this.database.saveDocument(q);
question.set_rev(q.getRev());
diff --git a/src/main/java/de/thm/arsnova/entities/Question.java b/src/main/java/de/thm/arsnova/entities/Question.java
index 4ad3a395..8b2d36e3 100644
--- a/src/main/java/de/thm/arsnova/entities/Question.java
+++ b/src/main/java/de/thm/arsnova/entities/Question.java
@@ -49,7 +49,6 @@ public class Question {
private int offsetX;
private int offsetY;
private int zoomLvl;
- private int[][] chosenFields;
public final String getType() {
return type;
@@ -259,14 +258,6 @@ public class Question {
this.zoomLvl = zoomLvl;
}
- public int[][] getChosenFields() {
- return chosenFields;
- }
-
- public void setChosenFields(int[][] chosenFields) {
- this.chosenFields = chosenFields;
- }
-
@Override
public final String toString() {
return "Question type '" + this.type + "': " + this.subject + ";\n" + this.text + this.possibleAnswers;
diff --git a/src/main/webapp/arsnova.properties b/src/main/webapp/arsnova.properties
new file mode 100644
index 00000000..dc6de872
--- /dev/null
+++ b/src/main/webapp/arsnova.properties
@@ -0,0 +1,31 @@
+security.arsnova-url=http://localhost:8080
+security.cas-server-url=https://cas.thm.de/cas
+
+security.facebook.key=318531508227494
+security.facebook.secret=e3f38cfc72bb63e35641b637081a6177
+
+security.twitter.key=PEVtidSG0HzSrxVRPpsCXw
+security.twitter.secret=mC0HOvxiEgqwdDWCcDoy3q75nUQPu1bYRp1ncHWGd0
+
+security.google.key=110959746118.apps.googleusercontent.com
+security.google.secret=CkzUJZswY8rjWCCYnHVovyGA
+
+security.ssl=false
+security.keystore=/etc/arsnova.thm.de.jks
+security.storepass=arsnova
+
+# minutes, after which the feedback is deleted
+feedback.cleanup=10
+
+couchdb.host=localhost
+couchdb.port=5984
+couchdb.name=arsnova
+couchdb.username=root
+couchdb.password=root
+
+socketio.ip=0.0.0.0
+socketio.port=10443
+
+connector.uri=http://localhost:8080/connector-service
+connector.username=test
+connector.password=test
--
GitLab