Merge branch 'BTB-34' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.elogbook into DEVELOP_BE
diff --git a/pom.xml b/pom.xml
index 922f92b..c529788 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,6 +134,11 @@
<version>${hibernate-annotations.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ <dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>3.2.0</version>
diff --git a/src/main/java/org/eclipse/openk/elogbook/common/timer/ContactSyncJob.java b/src/main/java/org/eclipse/openk/elogbook/common/timer/ContactSyncJob.java
index 81a35e3..e8ab611 100644
--- a/src/main/java/org/eclipse/openk/elogbook/common/timer/ContactSyncJob.java
+++ b/src/main/java/org/eclipse/openk/elogbook/common/timer/ContactSyncJob.java
@@ -5,14 +5,13 @@
import org.eclipse.openk.elogbook.exceptions.BtbException;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
public class ContactSyncJob implements Job {
private static final Logger LOGGER = Logger.getLogger(ContactSyncJob.class.getName());
@Override
- public void execute(JobExecutionContext arg0) throws JobExecutionException {
+ public void execute(JobExecutionContext arg0) {
LOGGER.debug("Quartz: ContactSyncJob called");
try {
diff --git a/src/main/java/org/eclipse/openk/elogbook/common/timer/InitPresenceCheckJobServlet.java b/src/main/java/org/eclipse/openk/elogbook/common/timer/InitPresenceCheckJobServlet.java
index ee0d301..279072e 100644
--- a/src/main/java/org/eclipse/openk/elogbook/common/timer/InitPresenceCheckJobServlet.java
+++ b/src/main/java/org/eclipse/openk/elogbook/common/timer/InitPresenceCheckJobServlet.java
@@ -2,7 +2,13 @@
import org.apache.log4j.Logger;
import org.eclipse.openk.elogbook.common.BackendConfig;
-import org.quartz.*;
+import org.quartz.CronScheduleBuilder;
+import org.quartz.JobBuilder;
+import org.quartz.JobDetail;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.Trigger;
+import org.quartz.TriggerBuilder;
import org.quartz.impl.StdSchedulerFactory;
import javax.servlet.ServletException;
@@ -10,7 +16,7 @@
public class InitPresenceCheckJobServlet extends HttpServlet {
- private static final long serialVersionUID = -7802116179801471578L;
+ private static final long serialVersionUID = -7802116179901471578L;
private static final Logger LOGGER = Logger.getLogger(InitPresenceCheckJobServlet.class.getName());
@@ -22,7 +28,7 @@
LOGGER.info("Init timer: 'Check presence job' triggered with cronExpression: " + cronExpression);
Trigger trigger = TriggerBuilder.newTrigger().withIdentity("CheckPresenceTrigger", "CheckPresenceTriggerGroup1")
- .withSchedule(CronScheduleBuilder.cronSchedule(cronExpression)).build();
+ .withSchedule(CronScheduleBuilder.cronSchedule(cronExpression)).build();
Scheduler scheduler;
diff --git a/src/main/resources/backendConfigDevLocal.json b/src/main/resources/backendConfigDevLocal.json
index f0de1af..9793bed 100644
--- a/src/main/resources/backendConfigDevLocal.json
+++ b/src/main/resources/backendConfigDevLocal.json
@@ -21,7 +21,7 @@
"enableEmailPresenceCheckJob": true,
"_cronSyncContacts": "0 0 1 * * ?",
- "cronSyncContacts": "* 0/1 * * * ?",
+ "cronSyncContacts": "0 0/1 * * * ?",
"enableContactSyncJob": true,
"contactServiceTechUser": "admin",
"contactServiceTechUserPwd": "admin"
