From 13472145cc47ce9d72b2c6da601c9c76157fd8ed Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Mon, 11 May 2020 13:44:38 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31819 --- .../run-mediacube-server-user-worker.launch | 30 ---------- .../META-INF/MANIFEST.MF | 1 + .../jobengine/server/DailyJobSchedule.java | 35 ----------- .../server/DailyJobScheduleTest.java | 60 ------------------- 4 files changed, 1 insertion(+), 125 deletions(-) delete mode 100644 server/-configuration/run-mediacube-server-user-worker.launch delete mode 100644 server/user.jobengine.osgi.server/src/user/jobengine/server/DailyJobSchedule.java delete mode 100644 server/user.jobengine.osgi.server/test/user/jobengine/server/DailyJobScheduleTest.java diff --git a/server/-configuration/run-mediacube-server-user-worker.launch b/server/-configuration/run-mediacube-server-user-worker.launch deleted file mode 100644 index 5f5185c3..00000000 --- a/server/-configuration/run-mediacube-server-user-worker.launch +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF index 02d7d034..aaf830e0 100644 --- a/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF +++ b/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF @@ -21,6 +21,7 @@ DynamicImport-Package: * Bundle-ClassPath: . Service-Component: OSGI-INF/nexioAPI.xml, OSGI-INF/octopusAPI.xml Export-Package: user.commons, + user.commons.cluster, user.commons.config, user.commons.ftp, user.commons.logging, diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/DailyJobSchedule.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/DailyJobSchedule.java deleted file mode 100644 index 53e619b4..00000000 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/DailyJobSchedule.java +++ /dev/null @@ -1,35 +0,0 @@ -package user.jobengine.server; - -import java.sql.Time; -import java.util.Calendar; - -public class DailyJobSchedule extends JobSchedule { - private Calendar lastRun; - - public DailyJobSchedule(String template, String name, Time scheduleTime) { - super(template, name, ScheduleType.DAILY); - setScheduleTime(scheduleTime); - } - - - public boolean IsSchedulable() { - boolean result = false; - Calendar now = Calendar.getInstance(); - now.set(Calendar.MILLISECOND, 0); - boolean check = (lastRun != null && now.getTimeInMillis() != lastRun.getTimeInMillis()) || lastRun == null; - if (check) { - Calendar schedule = Calendar.getInstance(); - schedule.setTime(getScheduleTime()); - - if (now.get(Calendar.HOUR_OF_DAY) == schedule.get(Calendar.HOUR_OF_DAY)) - if (now.get(Calendar.MINUTE) == schedule.get(Calendar.MINUTE)) - if (now.get(Calendar.SECOND) == schedule.get(Calendar.SECOND)) - result = true; - if (result) - lastRun = now; - } - - return result; - } - -} diff --git a/server/user.jobengine.osgi.server/test/user/jobengine/server/DailyJobScheduleTest.java b/server/user.jobengine.osgi.server/test/user/jobengine/server/DailyJobScheduleTest.java deleted file mode 100644 index 2f1aedf3..00000000 --- a/server/user.jobengine.osgi.server/test/user/jobengine/server/DailyJobScheduleTest.java +++ /dev/null @@ -1,60 +0,0 @@ -package user.jobengine.server; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import java.sql.Time; -import java.util.Calendar; - -import org.junit.Test; - -public class DailyJobScheduleTest { - private JobSchedule sut = null; - - @Test - public void testConstructor_Schedule() throws Exception { - // Fixture - String template = "template1"; - String name = "name1"; - Calendar now = Calendar.getInstance(); - - // Exercise - sut = new DailyJobSchedule(template, name, new Time(now.getTimeInMillis())); - - // Verify - assertEquals(template, sut.getTemplate()); - assertEquals(name, sut.getName()); - assertEquals(true, sut.IsSchedulable()); - } - - @Test - public void testIsSchedulable_CheckDuplicateSchedule() throws Exception { - // Fixture - String template = "template1"; - String name = "name1"; - Calendar now = Calendar.getInstance(); - - // Exercise - sut = new DailyJobSchedule(template, name, new Time(now.getTimeInMillis())); - - // Verify - assertEquals(true, sut.IsSchedulable()); - Thread.sleep(1); - assertEquals(false, sut.IsSchedulable()); - } - - @Test - public void testConstructor_NoSchedule() throws Exception { - // Fixture - String template = "template1"; - String name = "name1"; - Calendar now = Calendar.getInstance(); - now.add(Calendar.MINUTE, 1); - - // Exercise - sut = new DailyJobSchedule(template, name, new Time(now.getTimeInMillis())); - - // Verify - assertFalse(sut.IsSchedulable()); - } -} -- 2.54.0