diff --git a/pom.xml b/pom.xml
index 5e052cb6d741805ce0a6490ff334a6c4f9c6fd11..bf19387af6259ce59a052e43b43f3dd91054d81d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<packaging>war</packaging>
<properties>
- <org.springframework-version>4.0.8.RELEASE</org.springframework-version>
+ <org.springframework-version>4.0.9.RELEASE</org.springframework-version>
<org.springframework.security-version>3.2.5.RELEASE</org.springframework.security-version>
<org.springframework.integration-mail-version>4.0.6.RELEASE</org.springframework.integration-mail-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -17,8 +17,6 @@
<mobile.testing.path>../arsnova-mobile/src/main/webapp/build/testing/ARSnova</mobile.testing.path>
<mobile.path>${mobile.production.path}</mobile.path>
<customization.path>${basedir}/../arsnova-customization/src/main/webapp</customization.path>
- <presenter.rootPath>${basedir}/../arsnova-presenter</presenter.rootPath>
- <presenter.outputDir>target/arsnova-presenter-${presenter.version}</presenter.outputDir>
</properties>
<developers>
@@ -201,12 +199,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.9</version>
+ <version>1.7.10</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.9</version>
+ <version>1.7.10</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -263,7 +261,7 @@
<dependency>
<groupId>com.corundumstudio.socketio</groupId>
<artifactId>netty-socketio</artifactId>
- <version>1.7.5</version>
+ <version>1.7.6</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
@@ -274,7 +272,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.4.2</version>
+ <version>2.4.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -311,7 +309,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.3.5</version>
+ <version>4.3.6</version>
</dependency>
<dependency>
<groupId>de.thm.arsnova.connector</groupId>
@@ -343,7 +341,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
@@ -363,14 +361,6 @@
<contextPath>/mobile</contextPath>
<resourceBase>${mobile.path}</resourceBase>
</contextHandler>
- <contextHandler implementation="org.eclipse.jetty.webapp.WebAppContext">
- <contextPath>/presenter</contextPath>
- <baseResource implementation="org.eclipse.jetty.util.resource.ResourceCollection">
- <resourcesAsCSV>${presenter.rootPath}/${presenter.outputDir},${presenter.rootPath}/src/main/websources,${presenter.rootPath}/src/main/webapp</resourcesAsCSV>
- </baseResource>
- <descriptor>${presenter.rootPath}/src/main/config/WEB-INF/web.dev.xml</descriptor>
- <aliasCheck implementation="org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker" />
- </contextHandler>
<contextHandler implementation="org.eclipse.jetty.webapp.WebAppContext">
<contextPath>/customization</contextPath>
<resourceBase>${customization.path}</resourceBase>
@@ -386,37 +376,35 @@
<locales>en</locales>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>sonar-maven-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
- <configuration>
- <excludes>
- <exclude>**/Selenium*.java</exclude>
- <exclude>**/HttpRestApiTest.java</exclude>
- </excludes>
- </configuration>
+ <version>2.18.1</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <formats>
- <format>xml</format>
- <format>html</format>
- </formats>
- </configuration>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.7.2.201409121644</version>
+ <executions>
+ <execution>
+ <id>default-prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>default-report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -426,7 +414,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.12.1</version>
+ <version>2.13</version>
<configuration>
<configLocation>ARSnova-checkstyle-checker.xml</configLocation>
</configuration>
@@ -444,7 +432,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
</plugin>
</plugins>
</build>
diff --git a/src/main/java/de/thm/arsnova/CASLogoutSuccessHandler.java b/src/main/java/de/thm/arsnova/CASLogoutSuccessHandler.java
index c30b20007720ba7dd5e0a3df2a118731507db384..d2e5271272fe27427b7e333207f31e265215f17a 100644
--- a/src/main/java/de/thm/arsnova/CASLogoutSuccessHandler.java
+++ b/src/main/java/de/thm/arsnova/CASLogoutSuccessHandler.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova;
import java.io.IOException;
diff --git a/src/main/java/de/thm/arsnova/CasUserDetailsService.java b/src/main/java/de/thm/arsnova/CasUserDetailsService.java
index 53c56f58ff8ea22aa55aa6fc83593db41983c519..8012d1c45db61e79c47bd67a59c29d8c766638b5 100644
--- a/src/main/java/de/thm/arsnova/CasUserDetailsService.java
+++ b/src/main/java/de/thm/arsnova/CasUserDetailsService.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/FeedbackStorage.java b/src/main/java/de/thm/arsnova/FeedbackStorage.java
index 4ebeb6b6e71339584efb6ba1af16fe2a720279af..96636e8521df3cef50a0d60cc85a2e59e4bb1de0 100644
--- a/src/main/java/de/thm/arsnova/FeedbackStorage.java
+++ b/src/main/java/de/thm/arsnova/FeedbackStorage.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova;
import java.util.ArrayList;
diff --git a/src/main/java/de/thm/arsnova/ImageUtils.java b/src/main/java/de/thm/arsnova/ImageUtils.java
index d8d1f72eb67fb28440ddc631525306650d01d830..7ddd1cb449f7384b8e513c2233a9dfef8c51834e 100644
--- a/src/main/java/de/thm/arsnova/ImageUtils.java
+++ b/src/main/java/de/thm/arsnova/ImageUtils.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2014 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -16,7 +15,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
package de.thm.arsnova;
import java.awt.image.BufferedImage;
diff --git a/src/main/java/de/thm/arsnova/LoginAuthenticationFailureHandler.java b/src/main/java/de/thm/arsnova/LoginAuthenticationFailureHandler.java
index 9a775ea2c3328965c57c77aec39b069311412dfa..0a10994d01adcd671064228e3563f326a7b578ce 100644
--- a/src/main/java/de/thm/arsnova/LoginAuthenticationFailureHandler.java
+++ b/src/main/java/de/thm/arsnova/LoginAuthenticationFailureHandler.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/LoginAuthenticationSucessHandler.java b/src/main/java/de/thm/arsnova/LoginAuthenticationSucessHandler.java
index 81feacfe4b02c91914811f561b089b5a8783945e..f733ac92052bf6b92517d0191ed94e1c359fea10 100644
--- a/src/main/java/de/thm/arsnova/LoginAuthenticationSucessHandler.java
+++ b/src/main/java/de/thm/arsnova/LoginAuthenticationSucessHandler.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/aop/UserSessionAspect.java b/src/main/java/de/thm/arsnova/aop/UserSessionAspect.java
index 7ee29d1fd99432ca206002491c553b58bffbcf5f..777856b4dffa401a6178e95d87eb9cd7e351906f 100644
--- a/src/main/java/de/thm/arsnova/aop/UserSessionAspect.java
+++ b/src/main/java/de/thm/arsnova/aop/UserSessionAspect.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.aop;
import org.aspectj.lang.JoinPoint;
diff --git a/src/main/java/de/thm/arsnova/config/ExtraConfig.java b/src/main/java/de/thm/arsnova/config/ExtraConfig.java
index 62086912a31fd2478918434f5e4c1acdf3bc4f1a..922b7f3f27b71efb4dd8beabc09625af9f5ec9ea 100644
--- a/src/main/java/de/thm/arsnova/config/ExtraConfig.java
+++ b/src/main/java/de/thm/arsnova/config/ExtraConfig.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.config;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/de/thm/arsnova/config/SecurityConfig.java b/src/main/java/de/thm/arsnova/config/SecurityConfig.java
index cda4bacf0b0421ed9e025cab4648681548dd604e..e35d3d442ea1bde409a84c378987cd23ff5d043d 100644
--- a/src/main/java/de/thm/arsnova/config/SecurityConfig.java
+++ b/src/main/java/de/thm/arsnova/config/SecurityConfig.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.config;
import java.util.ArrayList;
diff --git a/src/main/java/de/thm/arsnova/controller/AbstractController.java b/src/main/java/de/thm/arsnova/controller/AbstractController.java
index 27eb3d61bf83f6931b7371dbb5c6d1d672766958..4f20a2cfd1e9c63d9fae1e0e47ac687791d42282 100644
--- a/src/main/java/de/thm/arsnova/controller/AbstractController.java
+++ b/src/main/java/de/thm/arsnova/controller/AbstractController.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.controller;
public class AbstractController {
diff --git a/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java b/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java
index a674b6b24476ea1b2e44635bc98366a02ddb37cf..32ee01d84c132c605cebe118dee3f44b4215e30c 100644
--- a/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index c07d9321c5ad70f05b508ccbb5fe0b1a8dfc9260..168fec5b4c922be6ee598a1bf2159e8919731291 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2014 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -44,6 +43,9 @@ public class ConfigurationController extends AbstractController {
public static final Logger LOGGER = LoggerFactory
.getLogger(ConfigurationController.class);
+ @Value("${api.path:}")
+ private String apiPath;
+
@Value("${customization.path}")
private String customizationPath;
@@ -62,6 +64,9 @@ public class ConfigurationController extends AbstractController {
@Value("${links.imprint.url}")
private String imprintUrl;
+ @Value("${links.blog.url:}")
+ private String blogUrl;
+
@Value("${links.privacy-policy.url}")
private String privacyPolicyUrl;
@@ -112,7 +117,19 @@ public class ConfigurationController extends AbstractController {
@Value("${upload.filesize_b}")
private String gridImageMaxFileSize;
+
+ @Value("${tracking.provider}")
+ private String trackingProvider;
+
+ @Value("${tracking.tracker-url}")
+ private String trackingTrackerUrl;
+
+ @Value("${tracking.site-id}")
+ private String trackingSiteId;
+ @Value("${optional.demoSessionKey:}")
+ private String demoSessionKey;
+
@Value("${pp.session-levels.de}")
private String ppLevelsDe;
@@ -127,7 +144,10 @@ public class ConfigurationController extends AbstractController {
HashMap<String, String> publicPool = new HashMap<String, String>();
/* The API path could be unknown to the client in case the request was forwarded */
- config.put("apiPath", request.getContextPath());
+ if ("".equals(apiPath)) {
+ apiPath = request.getContextPath();
+ }
+ config.put("apiPath", apiPath);
if (!"".equals(customizationPath)) {
config.put("customizationPath", customizationPath);
@@ -142,7 +162,10 @@ public class ConfigurationController extends AbstractController {
if (!"".equals(documentationUrl)) {
config.put("documentationUrl", documentationUrl);
}
- if (!"".equals(presenterDocumentationUrl)) {
+ if (!"".equals(blogUrl)) {
+ config.put("blogUrl", blogUrl);
+ }
+ if (!"".equals(presenterDocumentationUrl)) {
config.put("presenterDocumentationUrl", presenterDocumentationUrl);
}
if (!"".equals(overlayUrl)) {
@@ -157,6 +180,9 @@ public class ConfigurationController extends AbstractController {
if (!"".equals(privacyPolicyUrl)) {
config.put("privacyPolicyUrl", privacyPolicyUrl);
}
+ if (!"".equals(demoSessionKey)) {
+ config.put("demoSessionKey", demoSessionKey);
+ }
config.put("answerOptionLimit", Integer.valueOf(answerOptionLimit));
config.put("parseAnswerOptionFormatting", Boolean.valueOf(parseAnswerOptionFormatting));
@@ -178,6 +204,15 @@ public class ConfigurationController extends AbstractController {
publicPool.put("subjects", ppSubjects);
publicPool.put("licenses", ppLicenses);
publicPool.put("logoMaxFilesize", ppLogoMaxFilesize);
+
+ if (!"".equals(trackingTrackerUrl)) {
+ HashMap<String, String> tracking = new HashMap<String, String>();
+ config.put("tracking", tracking);
+
+ tracking.put("provider", trackingProvider);
+ tracking.put("trackerUrl", trackingTrackerUrl);
+ tracking.put("siteId", trackingSiteId);
+ }
publicPool.put("levelsDe", ppLevelsDe);
publicPool.put("levelsEn", ppLevelsEn);
diff --git a/src/main/java/de/thm/arsnova/controller/CourseController.java b/src/main/java/de/thm/arsnova/controller/CourseController.java
index ff424e7ae51588edf39a38ea8cf575e1208665e9..846ac5d43b1368d462b8f809c97f097546a9a8e2 100644
--- a/src/main/java/de/thm/arsnova/controller/CourseController.java
+++ b/src/main/java/de/thm/arsnova/controller/CourseController.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/controller/FeedbackController.java b/src/main/java/de/thm/arsnova/controller/FeedbackController.java
index 74cc2f7dc886c5d62faff3d430f443aa427d97a5..affed5b08157e858fc69538212d94ebdc54de583 100644
--- a/src/main/java/de/thm/arsnova/controller/FeedbackController.java
+++ b/src/main/java/de/thm/arsnova/controller/FeedbackController.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
index 964f1005eacfa6ea0e0a8d66831fbba57559264f..f1b1c5be7e6fc7bf62727e3a506f99ac8be34e5a 100644
--- a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -99,13 +98,26 @@ public class LecturerQuestionController extends AbstractController {
@RequestMapping(value = "/publish", method = RequestMethod.POST)
public final void publishAllQuestions(
@RequestParam final String sessionkey,
- @RequestParam(required = false) final Boolean publish
+ @RequestParam(required = false) final Boolean publish,
+ @RequestParam(value = "lecturequestionsonly", defaultValue = "false", required = false) final boolean lectureQuestionsOnly,
+ @RequestParam(value = "preparationquestionsonly", defaultValue = "false", required = false) final boolean preparationQuestionsOnly
) {
boolean p = true;
+ List<Question> questions;
+
if (publish != null) {
p = publish;
}
- questionService.publishAll(sessionkey, p);
+
+ if (lectureQuestionsOnly) {
+ questions = questionService.getLectureQuestions(sessionkey);
+ questionService.publishQuestions(sessionkey, publish, questions);
+ } else if (preparationQuestionsOnly) {
+ questions = questionService.getPreparationQuestions(sessionkey);
+ questionService.publishQuestions(sessionkey, publish, questions);
+ } else {
+ questionService.publishAll(sessionkey, p);
+ }
}
@RequestMapping(value = "/{questionId}/publishstatistics", method = RequestMethod.POST)
diff --git a/src/main/java/de/thm/arsnova/controller/LegacyController.java b/src/main/java/de/thm/arsnova/controller/LegacyController.java
index d0a724d2156a534bdc085d426bfcbdaa771ec227..2e67d22f6a8a1eb536a2d57b110779983ded4296 100644
--- a/src/main/java/de/thm/arsnova/controller/LegacyController.java
+++ b/src/main/java/de/thm/arsnova/controller/LegacyController.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/controller/LoginController.java b/src/main/java/de/thm/arsnova/controller/LoginController.java
index 95483dbfd78cc42393420a0e1de14109ec1a97cc..93e9ccf051225a0f5986c4080ebf6331ec427e4f 100644
--- a/src/main/java/de/thm/arsnova/controller/LoginController.java
+++ b/src/main/java/de/thm/arsnova/controller/LoginController.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -71,6 +70,7 @@ public class LoginController extends AbstractController {
private static final int MAX_USERNAME_LENGTH = 15;
private static final int MAX_GUESTHASH_LENGTH = 10;
+ @Value("${api.path:}") private String apiPath;
@Value("${customization.path}") private String customizationPath;
@Value("${security.guest.enabled}") private String guestEnabled;
@@ -235,15 +235,20 @@ public class LoginController extends AbstractController {
failureUrl = "/";
}
- /* Workaround until a solution is found to do a redirect which is
- * relative to the server root instead of the context path */
- String port;
+ String serverUrl = request.getScheme() + "://" + request.getServerName();
+ /* Handle proxy
+ * TODO: It might be better, to support the proposed standard: http://tools.ietf.org/html/rfc7239 */
+ int port = "".equals(request.getHeader("X-Forwarded-Port"))
+ ? Integer.valueOf(request.getHeader("X-Forwarded-Port")) : request.getServerPort();
if ("https".equals(request.getScheme())) {
- port = 443 != request.getServerPort() ? ":" + request.getLocalPort() : "";
+ if (443 != port) {
+ serverUrl = serverUrl + ":" + String.valueOf(port);
+ }
} else {
- port = 80 != request.getServerPort() ? ":" + request.getLocalPort() : "";
+ if (80 != port) {
+ serverUrl = serverUrl + ":" + String.valueOf(port);
+ }
}
- String serverUrl = request.getScheme() + "://" + request.getServerName() + port;
request.getSession().setAttribute("ars-login-success-url", serverUrl + successUrl);
request.getSession().setAttribute("ars-login-failure-url", serverUrl + failureUrl);
@@ -280,7 +285,10 @@ public class LoginController extends AbstractController {
request.getSession().invalidate();
SecurityContextHolder.clearContext();
if (auth instanceof CasAuthenticationToken) {
- return new RedirectView("/j_spring_cas_security_logout", true);
+ if ("".equals(apiPath)) {
+ apiPath = request.getContextPath();
+ }
+ return new RedirectView(apiPath + "/j_spring_cas_security_logout");
}
return new RedirectView(request.getHeader("referer") != null ? request.getHeader("referer") : "/");
}
@@ -290,8 +298,11 @@ public class LoginController extends AbstractController {
public final List<ServiceDescription> getServices(final HttpServletRequest request) {
List<ServiceDescription> services = new ArrayList<ServiceDescription>();
+ if ("".equals(apiPath)) {
+ apiPath = request.getContextPath();
+ }
/* The first parameter is replaced by the backend, the second one by the frondend */
- String dialogUrl = request.getContextPath() + "/auth/dialog?type={0}&successurl='{0}'";
+ String dialogUrl = apiPath + "/auth/dialog?type={0}&successurl='{0}'";
if ("true".equals(guestEnabled)) {
ServiceDescription sdesc = new ServiceDescription(
diff --git a/src/main/java/de/thm/arsnova/controller/SecurityExceptionControllerAdvice.java b/src/main/java/de/thm/arsnova/controller/SecurityExceptionControllerAdvice.java
index a21ae905f428feecb84ba19a237595d84f49cfa1..2b4608d972fcd6d097794190064597bddaaec9a2 100644
--- a/src/main/java/de/thm/arsnova/controller/SecurityExceptionControllerAdvice.java
+++ b/src/main/java/de/thm/arsnova/controller/SecurityExceptionControllerAdvice.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.controller;
import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java
index 5414992c7dedaa09eb056bdc36b9a3bb83137c73..05ebe3bd9c3e7b6db742cb59a1ab507067fab54a 100644
--- a/src/main/java/de/thm/arsnova/controller/SessionController.java
+++ b/src/main/java/de/thm/arsnova/controller/SessionController.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -195,7 +194,6 @@ public class SessionController extends AbstractController {
public final List<SessionInfo> getMyPublicPoolSessions(
final HttpServletResponse response
) {
- System.out.println("getMyPublicPoolSessions()");
List<SessionInfo> sessions = sessionService.getMyPublicPoolSessionsInfo();
if (sessions == null || sessions.isEmpty()) {
diff --git a/src/main/java/de/thm/arsnova/controller/SocketController.java b/src/main/java/de/thm/arsnova/controller/SocketController.java
index 6dc3ef68187124958595cd99d5dc3e571006d368..7d5945d809e58a9dcd0d9501f3381758d55b9566 100644
--- a/src/main/java/de/thm/arsnova/controller/SocketController.java
+++ b/src/main/java/de/thm/arsnova/controller/SocketController.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/controller/StatisticsController.java b/src/main/java/de/thm/arsnova/controller/StatisticsController.java
index 1a2237d0c44a5ec296776f51b5f8e8376f53a60b..b069a9e76018577857995985578966d2a001517b 100644
--- a/src/main/java/de/thm/arsnova/controller/StatisticsController.java
+++ b/src/main/java/de/thm/arsnova/controller/StatisticsController.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.controller;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/de/thm/arsnova/controller/UserController.java b/src/main/java/de/thm/arsnova/controller/UserController.java
index 9d3fe607d20642fb5d2d99f19915f89357d9ef5f..0c5e2403e0048d3312c182c33d0d1ad759ab9282 100644
--- a/src/main/java/de/thm/arsnova/controller/UserController.java
+++ b/src/main/java/de/thm/arsnova/controller/UserController.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/controller/WelcomeController.java b/src/main/java/de/thm/arsnova/controller/WelcomeController.java
index 626cb92495b900c1f210f1e55cf89824c4a64163..21b2c861b7cbd3b8e76d75e59d8b052e8c709721 100644
--- a/src/main/java/de/thm/arsnova/controller/WelcomeController.java
+++ b/src/main/java/de/thm/arsnova/controller/WelcomeController.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 8c789703f1ef8a1845b6719778e6da4cffca4267..0abdc10bed7369fc885da0b81d6bbb1b524d0c8f 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -16,7 +15,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
package de.thm.arsnova.dao;
import java.io.IOException;
@@ -462,6 +460,7 @@ public class CouchDBDao implements IDatabaseDao {
q.put("showAnswer", question.isShowAnswer());
q.put("abstention", question.isAbstention());
q.put("image", question.getImage());
+ q.put("fcImage", question.getFcImage());
q.put("gridSize", question.getGridSize());
q.put("offsetX", question.getOffsetX());
q.put("offsetY", question.getOffsetY());
@@ -501,6 +500,7 @@ public class CouchDBDao implements IDatabaseDao {
q.put("showAnswer", question.isShowAnswer());
q.put("abstention", question.isAbstention());
q.put("image", question.getImage());
+ q.put("fcImage", question.getFcImage());
q.put("gridSize", question.getGridSize());
q.put("offsetX", question.getOffsetX());
q.put("offsetY", question.getOffsetY());
@@ -1494,6 +1494,11 @@ public class CouchDBDao implements IDatabaseDao {
@Override
public void publishAllQuestions(final Session session, final boolean publish) {
final List<Question> questions = getQuestions(new NovaView("skill_question/by_session"), session);
+ publishQuestions(session, publish, questions);
+ }
+
+ @Override
+ public void publishQuestions(final Session session, final boolean publish, List<Question> questions) {
for (final Question q : questions) {
q.setActive(publish);
}
diff --git a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
index 9ad912d459b9491a35f7eafd47ec3218457d0059..36b2f59d39459e047431c792736e1b1a407b2f4e 100644
--- a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
+++ b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -16,7 +15,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
package de.thm.arsnova.dao;
import java.util.AbstractMap.SimpleEntry;
@@ -161,6 +159,8 @@ public interface IDatabaseDao {
void deleteAllInterposedQuestions(Session session);
void deleteAllInterposedQuestions(Session session, User user);
+
+ void publishQuestions(Session session, boolean publish, List<Question> questions);
void publishAllQuestions(Session session, boolean publish);
diff --git a/src/main/java/de/thm/arsnova/dao/NovaView.java b/src/main/java/de/thm/arsnova/dao/NovaView.java
index dbcbb8f55731e04efe7ee7e150ae613de78afd4f..56e16c2d81003710cca44ab9dd7e294347d516a0 100644
--- a/src/main/java/de/thm/arsnova/dao/NovaView.java
+++ b/src/main/java/de/thm/arsnova/dao/NovaView.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/entities/Answer.java b/src/main/java/de/thm/arsnova/entities/Answer.java
index ceb1821d7583318201fa0c4bda525cdbbce566d3..c8ab9ffcd6e868d79e57c173410d56aaabd485fe 100644
--- a/src/main/java/de/thm/arsnova/entities/Answer.java
+++ b/src/main/java/de/thm/arsnova/entities/Answer.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.entities;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/src/main/java/de/thm/arsnova/entities/Authorize.java b/src/main/java/de/thm/arsnova/entities/Authorize.java
index 4dab20f00d376b11fb97b09fae6a1a4b2bf8b9aa..853f04a62003551b8574e71a9a2681bb68af13e8 100644
--- a/src/main/java/de/thm/arsnova/entities/Authorize.java
+++ b/src/main/java/de/thm/arsnova/entities/Authorize.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.entities;
public class Authorize {
diff --git a/src/main/java/de/thm/arsnova/entities/DbUser.java b/src/main/java/de/thm/arsnova/entities/DbUser.java
index 7d185c25e5b4b435bec2bfc20f3f78715899f3e9..84217b5b7cb89151a6fedad0d37b09144e147df1 100644
--- a/src/main/java/de/thm/arsnova/entities/DbUser.java
+++ b/src/main/java/de/thm/arsnova/entities/DbUser.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.entities;
public class DbUser {
diff --git a/src/main/java/de/thm/arsnova/entities/Feedback.java b/src/main/java/de/thm/arsnova/entities/Feedback.java
index b2b4e995a9638110fc48e2178fcb48c1afa7e413..e2949c913a2259ffde2fbe75e75939ededb5f80e 100644
--- a/src/main/java/de/thm/arsnova/entities/Feedback.java
+++ b/src/main/java/de/thm/arsnova/entities/Feedback.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/entities/InterposedQuestion.java b/src/main/java/de/thm/arsnova/entities/InterposedQuestion.java
index 116535266e958aefde1dedbf3ab09084fe5f650f..ce9cc6adb28a1e2ba004d9496476b6af1f81ac6a 100644
--- a/src/main/java/de/thm/arsnova/entities/InterposedQuestion.java
+++ b/src/main/java/de/thm/arsnova/entities/InterposedQuestion.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -16,7 +15,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
package de.thm.arsnova.entities;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/src/main/java/de/thm/arsnova/entities/InterposedReadingCount.java b/src/main/java/de/thm/arsnova/entities/InterposedReadingCount.java
index 5620f834de4d3d9e917ee5003065b6b9d8691932..d6550faa1d9962b645c62ba62a3abdee9bd31ff8 100644
--- a/src/main/java/de/thm/arsnova/entities/InterposedReadingCount.java
+++ b/src/main/java/de/thm/arsnova/entities/InterposedReadingCount.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/entities/LoggedIn.java b/src/main/java/de/thm/arsnova/entities/LoggedIn.java
index 32f39b5ebc3e59001fbc6cf841fee9ce0c75ca82..796935621856cab0e1ef07bb22ce0b43c562f78b 100644
--- a/src/main/java/de/thm/arsnova/entities/LoggedIn.java
+++ b/src/main/java/de/thm/arsnova/entities/LoggedIn.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -16,7 +15,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
package de.thm.arsnova.entities;
import java.util.ArrayList;
diff --git a/src/main/java/de/thm/arsnova/entities/PossibleAnswer.java b/src/main/java/de/thm/arsnova/entities/PossibleAnswer.java
index ebc36f98e9c2f88d9ac05668ae808a01170289fb..b6648fbd5779cb5b2792b2a2f9c6fd193def9ab7 100644
--- a/src/main/java/de/thm/arsnova/entities/PossibleAnswer.java
+++ b/src/main/java/de/thm/arsnova/entities/PossibleAnswer.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/entities/Question.java b/src/main/java/de/thm/arsnova/entities/Question.java
index 4c0147c72d0eb0d1da9a3c26e9542c37d3bd2900..f03cdadbcb5b2e926a4383dcc027dd996745dbc1 100644
--- a/src/main/java/de/thm/arsnova/entities/Question.java
+++ b/src/main/java/de/thm/arsnova/entities/Question.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -45,6 +44,7 @@ public class Question {
private String _rev;
private String image;
+ private String fcImage;
private int gridSize;
private int offsetX;
private int offsetY;
@@ -249,6 +249,14 @@ public class Question {
public void setImage(final String image) {
this.image = image;
}
+
+ public String getFcImage() {
+ return fcImage;
+ }
+
+ public void setFcImage(final String fcImage) {
+ this.fcImage = fcImage;
+ }
public int getGridSize() {
return gridSize;
diff --git a/src/main/java/de/thm/arsnova/entities/ServiceDescription.java b/src/main/java/de/thm/arsnova/entities/ServiceDescription.java
index f9199ac039a0917062dd4c2c1e6b9528f2013ad1..6d37ad730301bc70b3a147523ef7b37be2620eab 100644
--- a/src/main/java/de/thm/arsnova/entities/ServiceDescription.java
+++ b/src/main/java/de/thm/arsnova/entities/ServiceDescription.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.entities;
public class ServiceDescription {
diff --git a/src/main/java/de/thm/arsnova/entities/Session.java b/src/main/java/de/thm/arsnova/entities/Session.java
index 071f0a443196484e7880bc4e889569272a6bccbb..85b809776a2664db6eca175bb0411ea0009ce6aa 100644
--- a/src/main/java/de/thm/arsnova/entities/Session.java
+++ b/src/main/java/de/thm/arsnova/entities/Session.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/entities/SessionInfo.java b/src/main/java/de/thm/arsnova/entities/SessionInfo.java
index 182b47f809ff844458c38bc83d208d31c9937560..8910586d0a6cebb6f3e3b6b8fb0fce32a34f1cdc 100644
--- a/src/main/java/de/thm/arsnova/entities/SessionInfo.java
+++ b/src/main/java/de/thm/arsnova/entities/SessionInfo.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2014 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -29,7 +28,7 @@ public class SessionInfo {
private boolean active;
private String courseType;
private long creationTime;
-
+
private int numQuestions;
private int numAnswers;
private int numInterposed;
@@ -43,7 +42,7 @@ public class SessionInfo {
this.courseType = session.getCourseType();
this.creationTime = session.getCreationTime();
}
-
+
public static List<SessionInfo> fromSessionList(List<Session> sessions) {
List<SessionInfo> infos = new ArrayList<SessionInfo>();
for (Session s : sessions) {
diff --git a/src/main/java/de/thm/arsnova/entities/Statistics.java b/src/main/java/de/thm/arsnova/entities/Statistics.java
index ecb9e36a7cb368367386a7f44e91472079709ad2..1cb01a7f0f5919d913c72b60a190d825fdf55d72 100644
--- a/src/main/java/de/thm/arsnova/entities/Statistics.java
+++ b/src/main/java/de/thm/arsnova/entities/Statistics.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.entities;
public class Statistics {
diff --git a/src/main/java/de/thm/arsnova/entities/User.java b/src/main/java/de/thm/arsnova/entities/User.java
index ba64e2ffb0f94cbac3dc93e45c40f1b8545669ef..710f909d2ad765dd32d7b0ae60f837b70f8615db 100644
--- a/src/main/java/de/thm/arsnova/entities/User.java
+++ b/src/main/java/de/thm/arsnova/entities/User.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.entities;
import java.io.Serializable;
diff --git a/src/main/java/de/thm/arsnova/entities/VisitedSession.java b/src/main/java/de/thm/arsnova/entities/VisitedSession.java
index bc40b8117e142800618113c65814d855f4fd807a..a358e078767f6f00de19c0cea97cb0520e5d4635 100644
--- a/src/main/java/de/thm/arsnova/entities/VisitedSession.java
+++ b/src/main/java/de/thm/arsnova/entities/VisitedSession.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/entities/transport/InterposedQuestion.java b/src/main/java/de/thm/arsnova/entities/transport/InterposedQuestion.java
index 702836ccc5f836edf8ddfc9c9e9ad09d2e088c4f..692ddf955380e0bd4868ec528761e4af9e58b7a4 100644
--- a/src/main/java/de/thm/arsnova/entities/transport/InterposedQuestion.java
+++ b/src/main/java/de/thm/arsnova/entities/transport/InterposedQuestion.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.entities.transport;
import java.util.ArrayList;
diff --git a/src/main/java/de/thm/arsnova/events/DeleteAnswerEvent.java b/src/main/java/de/thm/arsnova/events/DeleteAnswerEvent.java
index 1f5c564f9936ea82a8cb13aa91c723dd304fb4ba..e7a7be35a6e139a9f1e161dc80dd20334f0f4279 100644
--- a/src/main/java/de/thm/arsnova/events/DeleteAnswerEvent.java
+++ b/src/main/java/de/thm/arsnova/events/DeleteAnswerEvent.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.events;
import de.thm.arsnova.entities.Question;
diff --git a/src/main/java/de/thm/arsnova/events/DeleteInterposedQuestionEvent.java b/src/main/java/de/thm/arsnova/events/DeleteInterposedQuestionEvent.java
index b8aea746a91cd56939a1be1e1fe354a7f4be1cfa..185ebb3f9bf0f73e7bded4dff77d5865aa5060ba 100644
--- a/src/main/java/de/thm/arsnova/events/DeleteInterposedQuestionEvent.java
+++ b/src/main/java/de/thm/arsnova/events/DeleteInterposedQuestionEvent.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.events;
import de.thm.arsnova.entities.InterposedQuestion;
diff --git a/src/main/java/de/thm/arsnova/events/NewAnswerEvent.java b/src/main/java/de/thm/arsnova/events/NewAnswerEvent.java
index 256d569db2665b380988576c5e16319ddcfeb69b..d8f6149a3ee8e156ccacc3e99ea94dbc884cc5d1 100644
--- a/src/main/java/de/thm/arsnova/events/NewAnswerEvent.java
+++ b/src/main/java/de/thm/arsnova/events/NewAnswerEvent.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.events;
import de.thm.arsnova.entities.Answer;
diff --git a/src/main/java/de/thm/arsnova/events/NewInterposedQuestionEvent.java b/src/main/java/de/thm/arsnova/events/NewInterposedQuestionEvent.java
index d66d136254473c538cfcd1e005accea2aa0c7996..52c545f03bbe31e50a38abcfdf7262e8a9db3e1b 100644
--- a/src/main/java/de/thm/arsnova/events/NewInterposedQuestionEvent.java
+++ b/src/main/java/de/thm/arsnova/events/NewInterposedQuestionEvent.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.events;
import de.thm.arsnova.entities.InterposedQuestion;
diff --git a/src/main/java/de/thm/arsnova/events/NewQuestionEvent.java b/src/main/java/de/thm/arsnova/events/NewQuestionEvent.java
index aa40f1f6bc90aec96a0efc4f30e62a4dc34637b5..84bcf4ccc451e4a1faa2fe98fae6cb1eaa8e883f 100644
--- a/src/main/java/de/thm/arsnova/events/NewQuestionEvent.java
+++ b/src/main/java/de/thm/arsnova/events/NewQuestionEvent.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.events;
import de.thm.arsnova.entities.Question;
diff --git a/src/main/java/de/thm/arsnova/events/NovaEvent.java b/src/main/java/de/thm/arsnova/events/NovaEvent.java
index 81afe7c138b8750ecc95394098aba5e8f35aae90..47117d8d645c3b7fc5c2722b50c093de1391f177 100644
--- a/src/main/java/de/thm/arsnova/events/NovaEvent.java
+++ b/src/main/java/de/thm/arsnova/events/NovaEvent.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.events;
import org.springframework.context.ApplicationEvent;
diff --git a/src/main/java/de/thm/arsnova/events/NovaEventVisitor.java b/src/main/java/de/thm/arsnova/events/NovaEventVisitor.java
index 6f1ec04a56e65fcf23036f41dff141b4dabf05c7..6764f2d17c0db1bc405e6021ac74481c96c3db01 100644
--- a/src/main/java/de/thm/arsnova/events/NovaEventVisitor.java
+++ b/src/main/java/de/thm/arsnova/events/NovaEventVisitor.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.events;
public interface NovaEventVisitor {
diff --git a/src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java b/src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java
index d61aedcad1ff0ba25c5294c66bbbbdf651d505a3..559c929739cfcc1c3ea6640e6424b93aa6bf20ce 100644
--- a/src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java
+++ b/src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.security;
import java.io.Serializable;
diff --git a/src/main/java/de/thm/arsnova/security/DbUserDetailsService.java b/src/main/java/de/thm/arsnova/security/DbUserDetailsService.java
index cbee6375e0b28776e1bead12adfedbeaf0b7e1e7..0b55e02476ed35c5e3805675059fe604cc89b492 100644
--- a/src/main/java/de/thm/arsnova/security/DbUserDetailsService.java
+++ b/src/main/java/de/thm/arsnova/security/DbUserDetailsService.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2014 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/src/main/java/de/thm/arsnova/services/FeedbackService.java b/src/main/java/de/thm/arsnova/services/FeedbackService.java
index 3011fb64e95ab6bbd060f83a33e7c9055fc96509..7b1782291da0dee937d011b9079a1a6695e52fc7 100644
--- a/src/main/java/de/thm/arsnova/services/FeedbackService.java
+++ b/src/main/java/de/thm/arsnova/services/FeedbackService.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -16,7 +15,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
package de.thm.arsnova.services;
import java.util.HashMap;
diff --git a/src/main/java/de/thm/arsnova/services/IFeedbackService.java b/src/main/java/de/thm/arsnova/services/IFeedbackService.java
index b311d9c694b74aeaca033ce90682532bab8ef35c..8fd8b679ab298a218a8a3933f090168d0af6f915 100644
--- a/src/main/java/de/thm/arsnova/services/IFeedbackService.java
+++ b/src/main/java/de/thm/arsnova/services/IFeedbackService.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -16,7 +15,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
package de.thm.arsnova.services;
import de.thm.arsnova.entities.Feedback;
diff --git a/src/main/java/de/thm/arsnova/services/IQuestionService.java b/src/main/java/de/thm/arsnova/services/IQuestionService.java
index 633478fd05377f74204b4f9c6e4f1287af036ea7..a0e05fa64dfc902995ae4d083485c0493cc41e44 100644
--- a/src/main/java/de/thm/arsnova/services/IQuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/IQuestionService.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -16,10 +15,10 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
package de.thm.arsnova.services;
import java.util.List;
+import java.util.AbstractMap.SimpleEntry;
import de.thm.arsnova.entities.Answer;
import de.thm.arsnova.entities.InterposedQuestion;
@@ -91,6 +90,8 @@ public interface IQuestionService {
int getFlashcardCount(String sessionkey);
int getPreparationQuestionCount(String sessionkey);
+
+ SimpleEntry<String,Integer> getAnswerCountByQuestion(String questionid);
int countLectureQuestionAnswers(String sessionkey);
@@ -117,11 +118,12 @@ public interface IQuestionService {
void deleteAllInterposedQuestions(String sessionKeyword);
void publishAll(String sessionkey, boolean publish);
+
+ void publishQuestions(String sessionkey, boolean publish, List<Question> questions);
void deleteAllQuestionsAnswers(String sessionkey);
void deleteAllPreparationAnswers(String sessionkey);
void deleteAllLectureAnswers(String sessionkey);
-
}
diff --git a/src/main/java/de/thm/arsnova/services/ISessionService.java b/src/main/java/de/thm/arsnova/services/ISessionService.java
index 566c669a9d62d95236e86b50780377358d59b79e..0ded048f9016e43d164ac42e5338eab31422806f 100644
--- a/src/main/java/de/thm/arsnova/services/ISessionService.java
+++ b/src/main/java/de/thm/arsnova/services/ISessionService.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -16,7 +15,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
package de.thm.arsnova.services;
import java.util.AbstractMap.SimpleEntry;
diff --git a/src/main/java/de/thm/arsnova/services/IStatisticsService.java b/src/main/java/de/thm/arsnova/services/IStatisticsService.java
index 0aa89e09d5b6f136084ed9edecbc5ee093dfc0e8..a2cbb17534ef4add1e62b415715576f9b348da5b 100644
--- a/src/main/java/de/thm/arsnova/services/IStatisticsService.java
+++ b/src/main/java/de/thm/arsnova/services/IStatisticsService.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.services;
import de.thm.arsnova.entities.Statistics;
diff --git a/src/main/java/de/thm/arsnova/services/IUserService.java b/src/main/java/de/thm/arsnova/services/IUserService.java
index c2fec43dcc84525b5fbedb7ff64b8e117b06fa00..6428fb03d00983d5fbe91fd3deff77590bf8ef37 100644
--- a/src/main/java/de/thm/arsnova/services/IUserService.java
+++ b/src/main/java/de/thm/arsnova/services/IUserService.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -16,7 +15,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
package de.thm.arsnova.services;
import java.util.Map;
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index 0cbf305d1aaf7eb3e080ce4d02afd5a69281c9cf..d1c56f79609ffd1a52db81df8c3af5486c0f4ad5 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -16,13 +15,14 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
package de.thm.arsnova.services;
+import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.AbstractMap.SimpleEntry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -220,7 +220,6 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
databaseDao.deleteAnswers(question);
}
-
@Override
@PreAuthorize("isAuthenticated()")
public List<String> getUnAnsweredQuestionIds(final String sessionKey) {
@@ -501,6 +500,13 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
public int getPreparationQuestionCount(final String sessionkey) {
return databaseDao.getPreparationQuestionCount(getSession(sessionkey));
}
+
+ @Override
+ @PreAuthorize("isAuthenticated()")
+ public SimpleEntry<String,Integer> getAnswerCountByQuestion(final String questionid) {
+ final int questioncount = getAnswerCount(questionid);
+ return new AbstractMap.SimpleEntry<String, Integer>(questionid, questioncount);
+ }
@Override
@PreAuthorize("isAuthenticated()")
@@ -589,6 +595,17 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
}
databaseDao.publishAllQuestions(session, publish);
}
+
+ @Override
+ @PreAuthorize("isAuthenticated()")
+ public void publishQuestions(final String sessionkey, final boolean publish, List<Question> questions) {
+ final User user = getCurrentUser();
+ final Session session = getSession(sessionkey);
+ if (!session.isCreator(user)) {
+ throw new UnauthorizedException();
+ }
+ databaseDao.publishQuestions(session, publish, questions);
+ }
@Override
@PreAuthorize("isAuthenticated()")
diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index f69d718b6f4e89cedeb26db62064303eb48e240c..37b9f8b4cadebe3d43dd7e1110d1668c5df3826e 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -1,14 +1,13 @@
/*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
*
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
@@ -16,7 +15,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
package de.thm.arsnova.services;
import java.io.Serializable;
diff --git a/src/main/java/de/thm/arsnova/services/StatisticsService.java b/src/main/java/de/thm/arsnova/services/StatisticsService.java
index 19990272a533f97db74d084f02087158e41df9ec..4a5792aea46e4e133c4176e6895841e0f995cbd0 100644
--- a/src/main/java/de/thm/arsnova/services/StatisticsService.java
+++ b/src/main/java/de/thm/arsnova/services/StatisticsService.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.services;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/de/thm/arsnova/services/UserService.java b/src/main/java/de/thm/arsnova/services/UserService.java
index a6435db4376a422c99d53c45fced8d28a3715ce8..6ea5398051859444da664560c7b78e94c46902b7 100644
--- a/src/main/java/de/thm/arsnova/services/UserService.java
+++ b/src/main/java/de/thm/arsnova/services/UserService.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.services;
import java.io.UnsupportedEncodingException;
diff --git a/src/main/java/de/thm/arsnova/services/UserSessionService.java b/src/main/java/de/thm/arsnova/services/UserSessionService.java
index 6390634f466db13a5f8d55839826a454dcbc2af2..56b7f7fb39355fb7a2b0e61ea5dccc63791b9f38 100644
--- a/src/main/java/de/thm/arsnova/services/UserSessionService.java
+++ b/src/main/java/de/thm/arsnova/services/UserSessionService.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.services;
import java.util.UUID;
diff --git a/src/main/java/de/thm/arsnova/services/UserSessionServiceImpl.java b/src/main/java/de/thm/arsnova/services/UserSessionServiceImpl.java
index ac52d270e6c81df25b160d71a332e448d6e23709..9d18f826f2f1411d72fe4432b21d92372838bb9b 100644
--- a/src/main/java/de/thm/arsnova/services/UserSessionServiceImpl.java
+++ b/src/main/java/de/thm/arsnova/services/UserSessionServiceImpl.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.services;
import java.io.Serializable;
diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
index b7dbfd3c364bec9593f153efa5bdd74e2489535f..f8a8dcc2760bc5fe7aee23565bc4308276610c80 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.socket;
import java.io.FileInputStream;
@@ -403,6 +420,7 @@ public class ARSnovaSocketIOServer implements ApplicationListener<NovaEvent>, No
public void visit(NewAnswerEvent event) {
final String sessionKey = event.getSession().getKeyword();
this.reportAnswersToLecturerQuestionAvailable(event.getSession(), new Question(event.getQuestion()));
+ broadcastInSession(sessionKey, "countQuestionAnswersByQuestion", questionService.getAnswerCountByQuestion(event.getQuestion().get_id()));
broadcastInSession(sessionKey, "countLectureQuestionAnswers", questionService.countLectureQuestionAnswersInternal(sessionKey));
broadcastInSession(sessionKey, "countPreparationQuestionAnswers", questionService.countPreparationQuestionAnswersInternal(sessionKey));
sendToUser(event.getUser(), "unansweredLecturerQuestions", questionService.getUnAnsweredLectureQuestionIds(sessionKey, event.getUser()));
diff --git a/src/main/java/de/thm/arsnova/socket/message/Feedback.java b/src/main/java/de/thm/arsnova/socket/message/Feedback.java
index 2168e8d59574e1d3187dbf638f4bffcd19b3ccf1..58ea04f774e65c2bcbd9b28cc07358c898e69a0d 100644
--- a/src/main/java/de/thm/arsnova/socket/message/Feedback.java
+++ b/src/main/java/de/thm/arsnova/socket/message/Feedback.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.socket.message;
public class Feedback {
diff --git a/src/main/java/de/thm/arsnova/socket/message/Question.java b/src/main/java/de/thm/arsnova/socket/message/Question.java
index 8b6947a116755f9ac7948812f3e3230d70fbc1d6..e47c72d12395c35c084c057260a0b40bc0fef619 100644
--- a/src/main/java/de/thm/arsnova/socket/message/Question.java
+++ b/src/main/java/de/thm/arsnova/socket/message/Question.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.socket.message;
public class Question {
diff --git a/src/main/java/de/thm/arsnova/socket/message/Session.java b/src/main/java/de/thm/arsnova/socket/message/Session.java
index 3b56fe50c035f2c77d19c9d8db581755e249fc01..83688e24d4fd98ae7ade17024ca9709b1808b23e 100644
--- a/src/main/java/de/thm/arsnova/socket/message/Session.java
+++ b/src/main/java/de/thm/arsnova/socket/message/Session.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.socket.message;
public class Session {
diff --git a/src/main/java/de/thm/arsnova/web/CacheControl.java b/src/main/java/de/thm/arsnova/web/CacheControl.java
index 4b70755ccafcbc93f7aa0f1712665bd23e158109..a391c980e85966e377a630f6cc845e3e09ba3bcd 100644
--- a/src/main/java/de/thm/arsnova/web/CacheControl.java
+++ b/src/main/java/de/thm/arsnova/web/CacheControl.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.web;
import java.lang.annotation.ElementType;
diff --git a/src/main/java/de/thm/arsnova/web/CacheControlInterceptorHandler.java b/src/main/java/de/thm/arsnova/web/CacheControlInterceptorHandler.java
index 843f63f288fd548bf3496c8bfed996e7a32d3ad6..7546eb16db517574711d0ded215a9f009b89f95f 100644
--- a/src/main/java/de/thm/arsnova/web/CacheControlInterceptorHandler.java
+++ b/src/main/java/de/thm/arsnova/web/CacheControlInterceptorHandler.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.web;
import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/de/thm/arsnova/web/CorsFilter.java b/src/main/java/de/thm/arsnova/web/CorsFilter.java
index fc2e55f393103ae8fbbb6d17df6a05f4fa61af12..49c65a3461040767add009f80a1b3855ac4cf76f 100644
--- a/src/main/java/de/thm/arsnova/web/CorsFilter.java
+++ b/src/main/java/de/thm/arsnova/web/CorsFilter.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.web;
import java.io.IOException;
diff --git a/src/main/java/de/thm/arsnova/web/DeprecatedApi.java b/src/main/java/de/thm/arsnova/web/DeprecatedApi.java
index 353723ab81156f62b9a0940863653302b0fcfdec..763442d33e0d6a28ba480bcbeb6001081709d697 100644
--- a/src/main/java/de/thm/arsnova/web/DeprecatedApi.java
+++ b/src/main/java/de/thm/arsnova/web/DeprecatedApi.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.web;
import java.lang.annotation.ElementType;
diff --git a/src/main/java/de/thm/arsnova/web/DeprecatedApiInterceptorHandler.java b/src/main/java/de/thm/arsnova/web/DeprecatedApiInterceptorHandler.java
index 5d248608bcc1e871a3da087962218fd9050e5fd9..edbd54ccf1bdd9783974e11376ee1a1d1ade7e2e 100644
--- a/src/main/java/de/thm/arsnova/web/DeprecatedApiInterceptorHandler.java
+++ b/src/main/java/de/thm/arsnova/web/DeprecatedApiInterceptorHandler.java
@@ -1,3 +1,20 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package de.thm.arsnova.web;
import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/resources/arsnova.properties.example b/src/main/resources/arsnova.properties.example
index ee1715bcd06f7204d984af11bdd2eeca955c430a..61e9b9653f9aab1db12d2580f2244fa1db41e1b0 100644
--- a/src/main/resources/arsnova.properties.example
+++ b/src/main/resources/arsnova.properties.example
@@ -5,6 +5,11 @@
# http://localhost:8080 for development.
root-url=https://example.com
+# The path where the ARSnova API is accessible by clients. By default, this path
+# is set to the context path of the backend. If you are running the backend
+# behind a proxy server, you might need to set this path manually.
+#api.path=/api
+
# The context paths where the ARSnova modules have been deployed
customization.path=/customization
mobile.path=/mobile
@@ -94,7 +99,7 @@ security.user-db.reset-password-mail.body=You requested to reset your \
password.\n\nPlease follow the link below to set a new password:\n{0}
# LDAP authentication
-#
+#
# Specific parameters:
# url: LDAP server URL
# user-dn-pattern: Pattern used to check user credentials against the LDAP
@@ -193,8 +198,12 @@ question.answer-option-limit=8
# effect if neither MathJax nor Markdown are enabled.
question.parse-answer-option-formatting=false
+#optional: demo session keyword to show above session login button
+optional.demoSessionKey=
+
# Links which are displayed in the frontend applications
#
+links.blog.url=https://arsnova.eu/blog/
links.documentation.url=https://arsnova.eu/manual/
links.presenter-documentation.url=
links.overlay.url=https://arsnova.eu/overlay/
@@ -202,9 +211,20 @@ links.organization.url=
links.imprint.url=
links.privacy-policy.url=
- # configuration for the public pool
+# configuration for the public pool
pp.subjects = Mathematik,Informatik,BWL,Afrikanistik,Agrarbiologie,Agrarmarketing und Agrarmanagement,Agrarökologie,Agrartechnik,Agrarwissenschaften,Ägyptologie,Akkordeon,Alphabetisierung,Altbauinstandsetzung,Alte Geschichte,Altenpflege und Management,Ältere deutsche Literatur und Sprache,Altorientalistik,Ambient Assisted Living,Amerikanistik,Analytische Chemie,Angewandte Ethik,Angewandte Freizeitwissenschaft,Angewandte Informatik,Angewandte Literatur- und Kulturwissenschaften,Angewandte Mathematik,Angewandte Naturwissenschaften,Angewandte Pharmazie,Angewandte Politikwissenschaft,Angewandte Psychologie,Angewandte Sozial- und Bildungswissenschaften,Angewandte Sprachwissenschaften,Angewandte Systemwissenschaft,Anglistik / Englisch,Anthropologie,Applied Polymer Science,Applied Research,Applied System Dynamics,Arabistik,Arbeits- und Organisationspsychologie,Arbeitslehre / Arbeitswissenschaft,Arbeitslehre / Technik,Arbeitsmarktmanagement,Archäologische Restaurierung,Archäometrie,Architectural Lighting Design,Architektur,Archivwesen,Asienwissenschaften,Assyrologie,Astronomie,Astrophysik,Äthiopistik,Audioproduktion,Audiovisuelle Medien,Augenoptik,Ausstellungsdesign,Austronesien, Sprache/Kulturen,Auswärtige Angelegenheiten,Automatisierungstechnik,Automobilwirtschaft,Automotive System Engineering,Bahnbetrieb und Infrastruktur,Balkanphilologie,Baltic Management Studies,Baltische Philologie,Bank,Banking and Finance,Barrierefreie Systeme,Baubetrieb,Bauingenieurwesen,Baumanagement,Bauphysik,Baustoffingenieurwesen,Bautechnik,Beratung im Gesundheits-, Sozial- und Bildungswesen,Beratung und Sozialrecht,Beratungswissenschaft,Berufspädagogik,Betriebswirtschaft und Kultur-, Freizeit- und Sportmanagement,Betriebswirtschaft und Logistik,Betriebswirtschaft und Recht,Betriebswirtschaftslehre / BWL,Bewegung und Sport im Alter,Bibliothekswesen,Bildhauerei/Plastik,Bildung im Alter,Bildung und Erziehung im Kindesalter,Bildung und Medien,Bildungsmanagement,Bildungsplanung,Bilingualer Unterricht,Bio- and Pharmaceutical Analysis,Biochemie,Biografisches und Kreatives Schreiben,Bioinformatik,Biologie,Biologiedidaktik,Biomathematik,Biomedizinische Technik,Bionik,Biophysik,Biosystemtechnik,Biotechnologie,Biotechnologie und Medizintechnik,Bioverfahrenstechnik,Biowissenschaften,Blasinstrumente,Bodenwissenschaften,Botanik,Brand Design,Brand Management,Brauwesen und Getränketechnologie,British and American Studies,Buchkunst,Buchwissenschaften,Bühnenbild,Bühnentanz,Bundeswehrverwaltung,Business and Communication,Business and Organisation,Business Consulting,Business Ethics und CSR-Management,Business Integration,Business Travel Management,Cerebrovascular Medicine,Chemie,Chemie- und Bioingenieurwesen,Chemiedidaktik,Chemieingenieurwesen/Verfahrenstechnik,China Management,Chinesisch,Choreographie,Christliche Sozialethik und Gesellschaftspolitik,Claviorganum,Clinical Research Management,Coaching und Systementwicklung,Communication Engineering,Comparative and European Law,Compliance and Corporate Governance,Computational Mathematics,Computational Physics,Computational Science,Computer Aided Engineering,Computerlinguistik,Computervisualistik,Computing in the Humanities,Consulting und Controlling,Consumer Science,Controlling,Controlling and Risk Management,Customer Relationship Management,Dänisch,Data and Knowledge Engineering,Deaf Studies (Sprache und Kultur der Gehörlosengemeinschaft),Demographie,Denkmalpflege,Dentaltechnologie,Design,Deutsch - Französische Studien,Deutsch als Fremdsprache,Deutsch-Französisches Recht,Deutsch-Italienische Studien,Deutsches Recht,Diabetes und Management,Diakoniewissenschaft,Didaktik der Mathematik,Didaktik der Mittelschule,Dienstleistungsmanagement,Digitale Forensik,Digitale Medienproduktion,Dirigieren, Chor- und Orchesterleitung,Doing culture. Bildung und Reflexion kultureller Prozesse,Dolmetschen,Dramaturgie,Druck- und Medientechnik,E-Bass,E-Business und Social Media,Economics and Finance,Economics, Finance and Philosophy,Editions- und Dokumentwissenschaften,Education - Regelschule,Educational Media,Eigentums- und Wettbewerbsrecht,Elektro- und Informationstechnik,Elektroakustische Musik,Elektromobilität,Elementare Musikpädagogik,Elementarmathematik,Embedded Systems Engineering,Emergency (Education/Management) Practitioner,Energie und Rohstoffe,Energie- und Umweltmanagement,Energie- und Umweltschutztechnik,Energieprozesstechnik,Energietechnik,Energiewirtschaft,Engineering Physics,Entrepreneurship,Entsorgungsingenieurwesen,Epidemiology,Ergotherapie,Ergotherapie, Logopädie, Physiotherapie,Erlebnispädagogik,Erneuerbare Energien,Erwachsenenbildung,Ethik,Ethnologie,Europäische Betriebswirtschaft,Europäische Ethnologie,Europäische Geschichte,Europäische Literatur,Europäische Rechtslinguistik,Europäische Verwaltung und Politik,Europäisches Management und Controlling,Europalehramt,European Business Management,European Design,European Regulation of Network Industries,European Studies,Eurythmie,Evaluation,Evangelikale Theologie,Eventmarketing,Fachdidaktik,Fachübersetzen,Facility Management,Fahrzeug Interieur Design,Fahrzeuginformatik,Fahrzeugtechnik / Fahrzeugbau,Familienpsychologie,Farbtechnik und Raumgestaltung,Fennistik / Finnougristik,Fernsehjournalismus,Fertigungstechnik,Figurentheater,Film und Fernsehen,Filmmusik,Filmwissenschaft,Financial Information Systems,Finanz- und Rechnungswesen,Finanzmanagement,Fischereiwirtschaft,Flöte,Forstwirtschaft,Fotografie/Fotografik,FrankoMedia,Französisch,Französische Kulturwissenschaften,Friedens- und Konfliktforschung,Friesische Philologie,Frühe Hilfen,Funkidentifikation/Nahbereichsfunktechnik (RFID),Furniture and Interior Design,Gamedesign,Gartenbauwissenschaft,Gebärdensprache,Gebäude- und Energietechnik,Geisteswissenschaftliche Grundlagen,Gemeinschaftskunde,Gemeinwesenarbeit,Gender Studies,General Management,Geoarchäologie,Geographie,Geoinformatik,Geoinformationsmanagement,Geoingenieurwissenschaften,Geologie,Geoökologie,Geophysik,Geotechnik,Geotechnik/Bergbau,Geowissenschaften,Germanistik,Gerontologie,Gesang / Musiktheater,Geschichte,Geschichte der Naturwissenschaften und der Technik,Geschichte des Mittelalters,Gesellschaftswissenschaften,Gestaltungstechnik,Gesundheitsmanagement,Gesundheitspsychologie,Gesundheitswissenschaften,Gewerbelehrer,Gitarre,Global Logistics,Global Management,Global Studies,Globaler Wandel,Goldschmiedekunst,Griechische Philologie,Grundschuldidaktik,Handel,Hauptschuldidaktik,Hauswirtschaft und Werken,Hauswirtschaftswissenschaften,Hebammenkunde,Hebraistik,Heilpädagogik,Heimat- und Sachunterricht,Historische Hilfswissenschaften,Historische Instrumente,Historische Kunst- und Bilddiskurse,Historische Sprach-, Text- und Kulturwissenschaften,Hochbau,Holocaust Communication and Tolerance,Holzbau und Ausbau,Holzgestaltung,Holztechnik,Holzwirtschaft,Hörakustik,Hörfunk,Hotel- und Gastronomiemanagement,Human Resource Management - Personalpolitik,Humanbiologie,Humangeographie,Humanitäre Hilfe,Humanities,Hüttenwesen/Metallkunde,Hydrogeology and Environmental Geosciences,Hydrologie,Iberoromanische Sprachen,Immobilienwirtschaft,Indogermanistik,Indoiranistik,Indologie,Industrie-Elektronik,Industrielles Management und Engineering,Industriemarketing und Technischer Vertrieb,Informatik,Informatik und Kommunikationswissenschaften,Informatik-Ingenieurwesen,Information und Kommunikation,Informations- und Medientechnik,Informationsmanagement,Informationsmanagement im Gesundheitswesen,Informationsrecht,Informationstechnik,Informationsverarbeitung,Informationswissenschaften,Infrastruktur und Umwelt,Ingenieurbau,Ingenieurwesen,Ingenieurwissenschaften, allgemeine,Innenarchitektur,Instrumente und Gesang,Integrative Lerntherapie,Integrierte Gerontologie,Interaction Design,Intercultural Humanities,Intercultural Linguistics,Interdisziplinäre Antisemitismusforschung,Interdisziplinäre Mediävistik,Interdisziplinäre Polenstudien,Interdisziplinäre Sachbildung,Interdisziplinäre Studien,Interkulturelle Amerika- und Europastudien,Interkulturelle Kommunikation,Interkulturelle Studien: Polen und Deutsche in Europa,Interkulturelle Wirtschaftskommunikation,Interkulturelles Management,International Business,International Business and Economics,International Business and Social Sciences,International Business Communication,International Development Studies,International Fashion Retail,International Human Rights,International Information Systems,International Management,International Studies of Technology,Internationale Agrarwissenschaften,Internationale Beziehungen,Internationale Kulturhistorische Studien,Internationale Migration und Interkulturelle Beziehungen,Internationales Bauwesen,Internationales Marketing,Internationales Produkt- und Servicemanagement,Internationales Recht,Internationales Wirtschaftsingenieurwesen,Internet Science & Technology,Interreligiöse Studien,Iranistik,Islamwissenschaft,IT-Governance, Risk and Compliance Management,IT-Management,Italienisch,Japanologie,Jazz/Popularmusik,Journalism and Bionics,Journalistik,Judaistik/Jüdische Studien,Jugendliche Delinquenz,Kammermusik,Kardiotechnik,Kartographie,Kaukasiologie,Keilschriftkunde/Papyrologie,Keltologie,Keramik, freie,Kerntechnik,Kinder- und Jugendchorleitung,Kinderrecht,Kirche und Kultur,Kirchenmusik,Klassische Altertumswissenschaften,Klassische Philologie,Klimaschutz und -anpassung,Klinische Sozialarbeit,Kognitionswissenschaft,Kommunaler Verwaltungsdienst,Kommunalwirtschaft,Kommunikationsdesign / -technik,Kommunikationspsychologie,Kommunikationswissenschaft,Komposition / Theorie / Tonsatz,Konferenzdolmetschen,Konzertexamen,Koreanistik,Körperpflege,Korrepetition,Kosmetika und Waschmittel,Kosmetologie,Kraftfahrzeugelektronik,Kraftwerkstechnik,Krankenhaus- / Krankenpflege- / Sozialmanagement,Krankenpflege,Krankenversicherungs-Management,Kriminalistik,Kriminologie,Kultur und Medien,Kultur und Technik,Kultur und Wirtschaft,Kultur- und Medienmanagement,Kultur- und Medienpädagogik,Kulturanthropologie,Kulturarbeit,Kulturelle Grundlagen Europas,Kulturgeographie,Kulturgutsicherung,Kulturjournalismus,Kulturmanagement,Kulturpädagogik und Kulturmanagement,Kulturwissenschaft der Antike,Kulturwissenschaft, Wissensmanagement, Logistik: Cultural Engineering,Kulturwissenschaften,Kunst, freie,Kunst, Musik und Medien: Organisation und Vermittlung,Kunsterziehung / Künstlerisches Werken,Kunstgeschichte/Kunstwissenschaft,Kunstmanagement,Kunststofftechnik,Kunsttherapie,Kunstwissenschaft und Medientheorie,Landbau/Landwirtschaft,Landnutzung,Landschaftsökologie,Landschaftsplanung/-architektur,Laser- und Optotechnologien,Latein,Lateinamerikanistik,Lateinische Philologie,Lebensmittelchemie / -technologie,Lebensmittelwirtschaft,Leistungssport,Lernbereich Ästhetische Erziehung,Lernbereich Gesellschaftslehre,Lernbereich Kunst/Musik,Lernbereich Natur- und Gesellschaftswissenschaften,Lernbereich Naturwissenschaften/Technik,Lernbereich Sprachliche Grundbildung,Liberal Arts and Sciences,Lichtdesign,Life Sciences,Linguistische Datenverarbeitung,Literarisches Schreiben,Literatur und Medien,Literaturübersetzen,Literaturwissenschaft,Logik,Logistik - Management,Logistik, technische,Logopädie,Luft- und Raumfahrttechnik,Luftfahrzeugtechnik,Luftverkehrsmanagement,Makromolekülforschung,Management and Economics,Management in Klein- und mittelständischen Unternehmen,Management in Non-Profit-Organisationen,Management und Vertrieb,Management, Philosophy & Economics,Marine Biology,Maritime Technologien,Marketing,Markscheidewesen,Maschinenbau,Maschinenbau-Informatik,Maschinenbaumanagement,Maskenbild,Material- und Nanochemie,Materialtechnik,Materialwissenschaften,Mathematik,Mechanik,Mechatronik,Media Innovation Management,MediaArchitecture,Mediale Räume,Medical Education,Medien und Informationswesen / Medieninformatik,Medien- und Instruktionspsychologie,Medien- und Kulturwissenschaften,Medien- und Wirtschaftspsychologie,Mediengestaltung / Medienmanagement,Medienmanagement / Medienwirtschaft,Medienrecht,Medienwissenschaften,Medizin,Medizin-Ethik-Recht,Medizininformatik,Medizinisch-Biologische Chemie,Medizinische Assistenz,Medizinische Physik,Medizinische Radiologie-Technologie,Medizinische Systeme,Medizinmanagement,Medizinrecht,Medizintechnik,Mehrsprachigkeit,Mensch und Technik,Mergers and Acquisitions,Messe-, Kongress- und Eventmanagement,Messtechnik,Metalltechnik,Meteorologie,Methoden und Didaktik in angewandten Wissenschaften,Mikrobiologie,Mikrosystemtechnik,Milch- und Molkereiwirtschaft,Militärgeschichte/Militärsoziologie,Mineralogie,Mittlere und neuere Geschichte,Mobile Systeme,Mode- und Designmanagement,Mode-Design,Moderne Fremdsprachen,Molekulare Biologie,Molekulare Medizin,Molekulare Zellbiologie,Motologie,Multimedia-Didaktik,Museumskunde,Musical,Musik - Künstlerische Ausbildung,Musik - Solistenausbildung,Musik und Medien,Musikdesign,Musikerziehung,Musikinformatik,Musikinstrumentenbau,Musikjournalismus,Musikpädagogik und Musikvermittlung in Sozialer Arbeit,Musikproduktion,Musiktheater,Musiktherapie,Musikwissenschaft,Nachhaltige Energieökonomie,Nachhaltiger Tourismus,Nachrichtentechnik,Nahoststudien,Namenkunde/Onomastik,Natur- und Ingenieurwissenschaften,Naturheilkunde und komplementäre Medizin,Net Economy,Network Computing,Neuere und neueste Geschichte,Neugriechisch,Neuro-Cognitive Psychology,Neurowissenschaften,Niederdeutsch,Niederländische Philologie,Nordamerikastudien,Norwegisch,Nutzfahrzeugtechnologie,Nutztierwissenschaften,Ökobau,Ökologische Landwirtschaft,Ökotrophologie,Olympic Studies,Online-Medien,Open Media,Oper Chor- / Sologesang,Optotechnik und Bildverarbeitung,Organic and Molecular Electronics,Organizational Management,Orientalistik,Orthobionik,Orthodoxe Theologie,Ost- und südosteuropäische Geschichte,Ostasienwissenschaft,Osteopathie,Osteuropastudien,Ozeanographie,Pädagogik/Erziehungswissenschaft,Parodontologie,Patentingenieurwesen,Pferdewissenschaften,Pflanzenbauwissenschaften,Pflanzenbiotechnologie,Pflegelehrer / Pflegelehrerin,Pflegepädagogik,Pflegewissenschaft,Pharmaceutical Medicine,Pharmazeutische Technik / Chemie,Pharmazie,Philosophie,Phonetik und Sprechkunde,Photonik,Photovoltaik- und Halbleitertechnologie,Physician Assistance,Physik,Physik der Informationstechnologie,Physikalische Technik,Physiotherapie,Planungswissenschaften,Political and Social Studies,Politik & Wirtschaft,Politik und Recht,Politikmanagement,Politikwissenschaft,Politische Kommunikation,Polizeivollzugsdienst,Polnisch / Polonistik,Popmusik,Portugiesische Philologie,Präklinisches Management,Präventions-, Rehabilitations- und Fitnesssport,Präventionsmedizin,Print-Media-Management,Productions and Materials, Mechatronics, Design,Produktentwicklung und Produktion,Produktion und Automatisierung,Produktionsmanagement,Produktionstechnik,Projektmanagement,Projektmanagement und Engineering,Provinzialrömische Geschichte,Prozessmanagement,Psychiatrie,Psychoanalyse,Psychoanalytische Kulturwissenschaft,Psychologie,Psychologie und Mentale Gesundheit,Psychologische Psychotherapie,Psychosoziale Beratung,Psychotherapiewissenschaft,Public Management,Public Relations/Öffentlichkeitsarbeit,Publizistik/Zeitungswissenschaften,Qualität, Umwelt, Sicherheit und Hygiene,Qualitäts- und Umweltmanagement,Quality Engineering (Qualitätsingenieurwesen),Raumkonzept und Design,Rechts- und Wirtschaftswissenschaften,Rechtspflege,Rechtswissenschaft,Regenerative Biology and Medicine,Regie Oper,Regie Schauspiel,Regionalmanagement,Regionalwissenschaft Südostasien,Regionalwissenschaften,Regionalwissenschaften China,Rehabilitation Engineering,Rehabilitationspädagogik,Rehabilitationspsychologie,Religion und Psychotherapie,Religionsgeschichte, allgemeine,Religionspädagogik, evangelische,Religionspädagogik/Kirchliche Bildungsarbeit,Religionsphilosophie,Religionswissenschaft (vergleichende),Rescue Management,Restaurierung,Rettungsingenieurwesen,Rhetorik,Rhythmik,Risk Engineering & Management,Robotik,Romanistik,Rumänisch,Sachunterricht (naturwissenschaftlich),Sachunterricht (sozialwissenschaftlich),Sanitäts- und Rettungsmedizin,Schauspiel,Schiffbau,Schiffsbetriebstechnik,Schiffstechnik,Schmuckdesign,Schulpsychologie,Schwedisch,Seefahrt/Nautik,Seetouristik,Seeverkehrs- und Hafenwirtschaft,Semitistik,Sensortechnik,Service Management,Servicemanagement,Sexualwissenschaft,Sicherheit und Gefahrenabwehr,Sicherheitstechnik,Simulation und Experimentaltechnik,Simulation Technology,Sinologie,Skandinavistik/Nordistik,Slawistik,Softwaretechnik / Softwareengineering,Sonder- und Integrationspädagogik,Sonderpädagogik/Lehramt an Sonderschulen,Sorbisch,Soziale Arbeit,Sozialer Verwaltungsdienst,Sozialkunde,Sozialpädagogik,Sozialpädagogik & Management,Sozialpädagogik in der Ganztagsschule,Sozialpolitikforschung,Sozialwesen,Sozialwissenschaften/Sozialkunde,Soziologie,Sozioökonomie,Spanisch,Sport und Technik,Sportjournalismus und Sportmarketing,Sportmanagement,Sportpädagogik,Sportpsychologie,Sportwissenschaften,Sprache und Sprachförderung in Sozialer Arbeit,Sprache, Literatur, Kultur,Sprachen, angewandte,Sprachlehrforschung,Sprachwissenschaft/-theraphie,Sprachwissenschaft/Linguistik,Sprachwissenschaft/Patholinguistik,Sprecherziehung,Staats-/Verwaltungswissenschaft,Stadtökologie,Stadtplanung,Stahlbau,Statistik,Steuerwesen,Stochastik,Strafrecht,Strafvollzug,Streichinstrumente,Structural Chemistry and Spectroscopy,Suchthilfe,Südostasienwissenschaft,Südosteuropastudien,Südslawische Philologie,Supervision,Sustainability Management,Sustainability Sciences,Systems Engineering,Systemtechnik,Tanz,Tanz- und Bewegungstherapie,Tanzpädagogik,Technik,Technik und Philosophie,Technikgeschichte,Technikpädagogik,Technikrecht,Technisch-wissenschaftliche Kommunikation,Technische Betriebswirtschaftslehre,Technische Gebäudeausrüstung,Technische Informatik,Technische Kybernetik,Technische Orthopädie,Technische Physik,Technische Redaktion und Wissenskommunikation,Technisches Gebäudemanagement,Technologiemanagement,Technologiemanagement und -marketing,Technomathematik,Telekommunikation,Textil Design-Ingenieur,Textil- und Bekleidungstechnik,Textilgestaltung,The Americas - Las Américas - Les Amériques,Theater- und Kulturmanagement,Theater- und Veranstaltungstechnik,Theater-, Film- und Medienwissenschaft,Theaterausstattung,Theaterpädagogik,Theaterwissenschaften,Theologie,Theologie / Religion, katholische,Theologie / Soziale Arbeit im interkulturellen Kontext,Theologie, altkatholische,Theologie/Religion, evangelisch,Therapiewissenschaft,Tibetologie/Birmanistik,Tiefbau,Tiermedizin,Ton- und Bildtechnik,Toningenieur,Tourismus, Catering und Hospitality Services,Tourismusmanagement,Tourismusmarketing,Toxikologie,Transportation Design,Transportmanagement,Tschechische Philologie,Türkisch,Turkologie,Übersetzen (orientalische Sprachen),Umwelt & Bildung,Umwelt und Natur in metropolitanen Räumen,Umweltchemie,Umweltmanagement,Umweltnaturwissenschaften,Umweltplanung,Umweltpolitik,Umweltschutztechnik,Umwelttechnik,Umweltwirtschaft/Umweltrecht/Umweltverwaltung,Umweltwissenschaft Marine,Umweltwissenschaften/Ökologie,Uralistik,Urban Management,Urban Studies,Urgeschichte/Vorgeschichte/Frühgeschichte,Verarbeitungstechnik,Verbrennungsmotoren,Verfahrenstechnik,Vergleichende Kultur- und Religionswissenschaft,Verkehrsbetriebswirtschaft,Verkehrsbetriebswirtschaft und Personenverkehr,Verkehrsinformatik,Verkehrstechnik,Verkehrswesen,Verkehrswirtschaftsingenieurwesen,Verlagsherstellung,Verlagswirtschaft/Buchhandel,Vermessungswesen,Vermögensmanagement,Verpackungstechnik,Versicherungsmanagement,Versorgungstechnik,Versorgungstechnik und Entsorgungstechnik,Vertriebsingenieurwesen,Verwaltung und Recht,Verwaltungsdienst,Verwaltungsinformatik,Verwaltungsmanagement,Verwaltungswissenschaft,Virtual Design,Visuelle Kommunikation,Volksmusik,Volkswirtschaftslehre,Vorderasiatische Altertumswissenschaft/Archäologie,Waldorfpädagogik,Wasser- und Abfallwirtschaft,Wasserbau- und Kulturtechnik,Wasserstofftechnik,Wasserwirtschaft und Bodenmanagement,Wehrtechnik,Weinbau,Weiterbildungsforschung und Organisationsentwicklung,Werbewirtschaft,Werkstoff- und Oberfächentechnik,Werkstoffingenieurwesen,Windenergietechnik,Wirk- und Naturstoffchemie,Wirtschaft,Wirtschaft Technik Haushalt / Soziales,Wirtschafts- und Sozialgeographie,Wirtschafts- und Sozialgeschichte,Wirtschafts- und Sozialkunde,Wirtschafts- und Sozialwissenschaften,Wirtschaftschemie,Wirtschaftsförderung,Wirtschaftsgeographie,Wirtschaftsinformatik,Wirtschaftsingenieurwesen,Wirtschaftsjournalismus,Wirtschaftslehre,Wirtschaftsmathematik,Wirtschaftspädagogik,Wirtschaftsphysik,Wirtschaftspsychologie,Wirtschaftsrecht,Wirtschaftssprachen,Wirtschaftssprachen Asien und Management,Wirtschaftsübersetzen,Wirtschaftswissenschaften/Ökonomie,Wissenschaft vom christlichen Orient,Wissenschaftsforschung,Wissenschaftsgeschichte,Wissenschaftsjournalismus,Wissenschaftsmanagement,Zahnmedizin,Zolldienst,Zukunftsforschungs
pp.licenses = CC by - Attribution, CC nc - Non-Commercial, CC nd - No Derivatives, CC sa - Share Alike, CCO - Public Domain, CC by-nd - Attribution-No Derivatives, CC by-c - Attribution-Non-Commercial, CC by-nc-sa - Attribution-Non-Derivatives-Share Alike, CC by-nc-nd Attribution-Non-Commercial- No Derivatives, GNU GPL - GNU General Public License , DiPP - Digital Peer Publishing, Deposit Licence
pp.logofilesize_b = 102400
pp.session-levels.de = Abitur,Allgemeinbildung,Bachelor,Master,Sonstiges,"Wer wird Millionär"
-pp.session-levels.en = Highschool,General Education,Bachelor,Master,Miscellaneous,"Who Wants to Be a Millionaire?"
\ No newline at end of file
+pp.session-levels.en = Highschool,General Education,Bachelor,Master,Miscellaneous,"Who Wants to Be a Millionaire?"
+
+
+################################################################################
+# Tracking
+################################################################################
+# It is possible to use an external tracking software with ARSnova. Currently
+# Piwik is the only supported tracking provider.
+#
+tracking.provider=piwik
+tracking.tracker-url=
+tracking.site-id=
\ No newline at end of file
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index f947a78d49176f34698ce9af626cfe7e31d1fa43..b2bd8a2ba9cf247ef6ff6d61fc78714aa7b64c02 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -8,5 +8,6 @@ log4j.category.de.thm.arsnova=INFO
log4j.category.org.springframework=INFO
log4j.category.com.corundumstudio.socketio=INFO
log4j.category.com.corundumstudio.socketio.handler.AuthorizeHandler=ERROR
+log4j.category.com.corundumstudio.socketio.handler.WrongUrlHandler=ERROR
log4j.category.com.fourspaces.couchdb=OFF
log4j.category.net.sf.json=WARN
diff --git a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
index 34a833e2a5f64d9d41a03808058efb0ff9aafca7..4fad97d34bf85c163c55e6c14d9d7e6a127ad4b2 100644
--- a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
+++ b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
@@ -477,6 +477,12 @@ public class StubDatabaseDao implements IDatabaseDao {
public void deleteAllInterposedQuestions(Session session) {
// TODO Auto-generated method stub
}
+
+ @Override
+ public void publishQuestions(Session session, boolean publish, List<Question> questions) {
+ // TODO Auto-generated method stub
+
+ }
@Override
public void publishAllQuestions(Session session, boolean publish) {
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index 0d5baa750ec10180b57cb470b6f7544664185509..bcd9e8671fc91215136f1da6eff1270c2d3ea265 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -5,6 +5,11 @@
# http://localhost:8080 for development.
root-url=https://example.com
+# The path where the ARSnova API is accessible by clients. By default, this path
+# is set to the context path of the backend. If you are running the backend
+# behind a proxy server, you might need to set this path manually.
+#api.path=/api
+
# The context paths where the ARSnova modules have been deployed
customization.path=/customization
mobile.path=/mobile
@@ -94,7 +99,7 @@ security.user-db.reset-password-mail.body=You requested to reset your \
password.\n\nPlease follow the link below to set a new password:\n{0}
# LDAP authentication
-#
+#
# Specific parameters:
# url: LDAP server URL
# user-dn-pattern: Pattern used to check user credentials against the LDAP
@@ -191,11 +196,26 @@ question.answer-option-limit=8
# effect if neither MathJax nor Markdown are enabled.
question.parse-answer-option-formatting=false
+#optional: demo session keyword to show above session login button
+optional.demoSessionKey=
+
# Links which are displayed in the frontend applications
#
+links.blog.url=https://arsnova.eu/blog/
links.documentation.url=https://arsnova.eu/manual/
links.presenter-documentation.url=
links.overlay.url=https://arsnova.eu/overlay/
links.organization.url=
links.imprint.url=
links.privacy-policy.url=
+
+
+################################################################################
+# Tracking
+################################################################################
+# It is possible to use an external tracking software with ARSnova. Currently
+# Piwik is the only supported tracking provider.
+#
+tracking.provider=piwik
+tracking.tracker-url=
+tracking.site-id=