diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java index 7bdcb6077385b6cca966f3f8aa9fd2eaaa3b9a32..1e3915e9c3d0adec08d012b4351c10b5c648c695 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 4ad3a395689b42f0c9d1aba40a9c67ba1b32a159..8b2d36e30c75c655eec2f7fdc76b95bffe0060fe 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 0000000000000000000000000000000000000000..dc6de872e4301062dfbcb37afe7f8f25a5b68f9f --- /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