From 855c3236b0ef5dab07f86470c9cda925dbf71a00 Mon Sep 17 00:00:00 2001 From: sinanselimoglu Date: Fri, 30 Oct 2015 19:34:17 +0200 Subject: [PATCH 1/3] Build 0.4.5.4 --- pom.xml | 10 +++++----- robe-admin/pom.xml | 2 +- robe-assets/pom.xml | 2 +- robe-auth/pom.xml | 2 +- robe-common/pom.xml | 2 +- robe-convert/pom.xml | 2 +- robe-crud/pom.xml | 2 +- robe-guice/pom.xml | 2 +- robe-hibernate/pom.xml | 2 +- robe-mail/pom.xml | 2 +- robe-quartz/pom.xml | 2 +- robe-servlet/pom.xml | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index c5835400..97761f59 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ io.robe robe-parent - 0.4.5.3 + 0.4.5.4 pom Robe Project www.robe.io @@ -305,7 +305,7 @@ - + @@ -433,7 +433,7 @@ - + org.sonatype.plugins nexus-staging-maven-plugin diff --git a/robe-admin/pom.xml b/robe-admin/pom.xml index 19249ec3..2c159211 100644 --- a/robe-admin/pom.xml +++ b/robe-admin/pom.xml @@ -5,7 +5,7 @@ io.robe robe-parent - 0.4.5.3 + 0.4.5.4 4.0.0 diff --git a/robe-assets/pom.xml b/robe-assets/pom.xml index f55da60b..b59f05eb 100644 --- a/robe-assets/pom.xml +++ b/robe-assets/pom.xml @@ -5,7 +5,7 @@ robe-parent io.robe - 0.4.5.3 + 0.4.5.4 4.0.0 diff --git a/robe-auth/pom.xml b/robe-auth/pom.xml index 42512733..41c4e19c 100644 --- a/robe-auth/pom.xml +++ b/robe-auth/pom.xml @@ -5,7 +5,7 @@ robe-parent io.robe - 0.4.5.3 + 0.4.5.4 4.0.0 diff --git a/robe-common/pom.xml b/robe-common/pom.xml index 2a7437b3..ac9b8430 100644 --- a/robe-common/pom.xml +++ b/robe-common/pom.xml @@ -5,7 +5,7 @@ robe-parent io.robe - 0.4.5.3 + 0.4.5.4 4.0.0 diff --git a/robe-convert/pom.xml b/robe-convert/pom.xml index 2f9059a6..7737683f 100644 --- a/robe-convert/pom.xml +++ b/robe-convert/pom.xml @@ -5,7 +5,7 @@ robe-parent io.robe - 0.4.5.3 + 0.4.5.4 4.0.0 diff --git a/robe-crud/pom.xml b/robe-crud/pom.xml index 82e0f3c0..29e490a6 100644 --- a/robe-crud/pom.xml +++ b/robe-crud/pom.xml @@ -5,7 +5,7 @@ robe-parent io.robe - 0.4.5.3 + 0.4.5.4 4.0.0 diff --git a/robe-guice/pom.xml b/robe-guice/pom.xml index 123861c0..3e903981 100644 --- a/robe-guice/pom.xml +++ b/robe-guice/pom.xml @@ -5,7 +5,7 @@ robe-parent io.robe - 0.4.5.3 + 0.4.5.4 4.0.0 diff --git a/robe-hibernate/pom.xml b/robe-hibernate/pom.xml index 185d897d..e1b08bf4 100644 --- a/robe-hibernate/pom.xml +++ b/robe-hibernate/pom.xml @@ -5,7 +5,7 @@ robe-parent io.robe - 0.4.5.3 + 0.4.5.4 4.0.0 diff --git a/robe-mail/pom.xml b/robe-mail/pom.xml index 8fb13cb9..510b8156 100644 --- a/robe-mail/pom.xml +++ b/robe-mail/pom.xml @@ -5,7 +5,7 @@ robe-parent io.robe - 0.4.5.3 + 0.4.5.4 4.0.0 diff --git a/robe-quartz/pom.xml b/robe-quartz/pom.xml index acd73c16..61cfc2cc 100644 --- a/robe-quartz/pom.xml +++ b/robe-quartz/pom.xml @@ -5,7 +5,7 @@ robe-parent io.robe - 0.4.5.3 + 0.4.5.4 4.0.0 diff --git a/robe-servlet/pom.xml b/robe-servlet/pom.xml index 0b32f5f9..9f838d92 100644 --- a/robe-servlet/pom.xml +++ b/robe-servlet/pom.xml @@ -5,7 +5,7 @@ robe-parent io.robe - 0.4.5.2 + 0.4.5.4 4.0.0 From 1078d0bb2457243eecc2fd23bfc62a645d64dcc1 Mon Sep 17 00:00:00 2001 From: sinanselimoglu Date: Mon, 2 Nov 2015 09:50:37 +0200 Subject: [PATCH 2/3] Signature operations --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 97761f59..55ea85c6 100644 --- a/pom.xml +++ b/pom.xml @@ -305,7 +305,7 @@ - + @@ -433,7 +433,7 @@ - + org.sonatype.plugins nexus-staging-maven-plugin From 039fecd16bc01e9f9c3ce9a48bc5c2456f71002f Mon Sep 17 00:00:00 2001 From: Seray Uzgur Date: Tue, 10 Nov 2015 12:07:52 +0200 Subject: [PATCH 3/3] Inject log fixed --- .../java/io/robe/quartz/ManagedQuartz.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/robe-quartz/src/main/java/io/robe/quartz/ManagedQuartz.java b/robe-quartz/src/main/java/io/robe/quartz/ManagedQuartz.java index 0ef637d2..70252413 100644 --- a/robe-quartz/src/main/java/io/robe/quartz/ManagedQuartz.java +++ b/robe-quartz/src/main/java/io/robe/quartz/ManagedQuartz.java @@ -6,6 +6,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.HashSet; import java.util.Set; @@ -14,6 +15,11 @@ public class ManagedQuartz implements Managed { private Set onStartJobs; private Set onStopJobs; + public ManagedQuartz() { + this.onStartJobs = new HashSet<>(); + this.onStopJobs = new HashSet<>(); + } + public ManagedQuartz(Set onStartJobs, Set onStopJobs) { this.onStartJobs = onStartJobs; this.onStopJobs = onStopJobs; @@ -38,10 +44,10 @@ public void stop() throws SchedulerException { private void scheduleAllJobsOnApplicationStop() throws SchedulerException { for (JobDetail detail : onStopJobs) { - if(!JobManager.getInstance().checkExists(detail.getKey())) + if (!JobManager.getInstance().checkExists(detail.getKey())) JobManager.getInstance().scheduleJob(detail, executeNowTrigger()); else - JobManager.getInstance().scheduleJob(detail,addNowTrigger(detail.getKey()),true); + JobManager.getInstance().scheduleJob(detail, addNowTrigger(detail.getKey()), true); } } @@ -49,11 +55,11 @@ private void scheduleAllJobsOnApplicationStop() throws SchedulerException { private void scheduleAllJobsOnApplicationStart() throws SchedulerException { LOGGER.info("Jobs to run on application start: " + onStartJobs); - for (JobDetail detail : onStartJobs) { - if(!JobManager.getInstance().checkExists(detail.getKey())) + for (JobDetail detail : onStartJobs) { + if (!JobManager.getInstance().checkExists(detail.getKey())) JobManager.getInstance().scheduleJob(detail, executeNowTrigger()); else - JobManager.getInstance().scheduleJob(detail, addNowTrigger(detail.getKey()),true); + JobManager.getInstance().scheduleJob(detail, addNowTrigger(detail.getKey()), true); } } @@ -64,7 +70,7 @@ private Trigger executeNowTrigger() { private Set addNowTrigger(JobKey key) throws SchedulerException { Set triggers = Sets.newHashSet(JobManager.getInstance().getTriggersOfJob(key.getName(), key.getGroup())); triggers.add(executeNowTrigger()); - return triggers; + return triggers; }