Juan Hernandez has uploaded a new change for review. Change subject: core: Move scheduler to modules ......................................................................
core: Move scheduler to modules The scheduler component used to be into a "beans" folder, but it is not different from other components, like "dal" or "bll", so it makes more sense to have it in the same folder. Change-Id: I291a87742ddb2d536bd0d11f54515ac531b69659 Signed-off-by: Juan Hernandez <[email protected]> --- D backend/manager/modules/beans/pom.xml M backend/manager/modules/pom.xml R backend/manager/modules/scheduler/pom.xml R backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/FixedDelayJobListener.java R backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/JobWrapper.java R backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/OnTimerMethodAnnotation.java R backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/SchedulerUtil.java R backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/SchedulerUtilQuartzImpl.java R backend/manager/modules/scheduler/src/main/modules/org/ovirt/engine/core/scheduler/main/module.xml R backend/manager/modules/scheduler/src/test/java/org/ovirt/engine/core/utils/timer/SchedulerUtilQuartsImplTest.java 10 files changed, 2 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/13224/1 diff --git a/backend/manager/modules/beans/pom.xml b/backend/manager/modules/beans/pom.xml deleted file mode 100644 index d354e49..0000000 --- a/backend/manager/modules/beans/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.ovirt.engine.core</groupId> - <artifactId>manager-modules</artifactId> - <version>3.3.0-SNAPSHOT</version> - </parent> - - <artifactId>beans</artifactId> - <packaging>pom</packaging> - - <name>engine beans</name> - - <modules> - <module>scheduler</module> - </modules> - -</project> diff --git a/backend/manager/modules/pom.xml b/backend/manager/modules/pom.xml index c8ee4c4..0e4843e 100644 --- a/backend/manager/modules/pom.xml +++ b/backend/manager/modules/pom.xml @@ -19,9 +19,9 @@ <module>common</module> <module>dal</module> <module>vdsbroker</module> + <module>scheduler</module> <module>searchbackend</module> <module>bll</module> - <module>beans</module> <module>restapi</module> <module>root</module> </modules> diff --git a/backend/manager/modules/beans/scheduler/pom.xml b/backend/manager/modules/scheduler/pom.xml similarity index 96% rename from backend/manager/modules/beans/scheduler/pom.xml rename to backend/manager/modules/scheduler/pom.xml index c017e2d..ac07efe 100644 --- a/backend/manager/modules/beans/scheduler/pom.xml +++ b/backend/manager/modules/scheduler/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.ovirt.engine.core</groupId> - <artifactId>beans</artifactId> + <artifactId>manager-modules</artifactId> <version>3.3.0-SNAPSHOT</version> </parent> diff --git a/backend/manager/modules/beans/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/FixedDelayJobListener.java b/backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/FixedDelayJobListener.java similarity index 100% rename from backend/manager/modules/beans/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/FixedDelayJobListener.java rename to backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/FixedDelayJobListener.java diff --git a/backend/manager/modules/beans/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/JobWrapper.java b/backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/JobWrapper.java similarity index 100% rename from backend/manager/modules/beans/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/JobWrapper.java rename to backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/JobWrapper.java diff --git a/backend/manager/modules/beans/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/OnTimerMethodAnnotation.java b/backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/OnTimerMethodAnnotation.java similarity index 100% rename from backend/manager/modules/beans/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/OnTimerMethodAnnotation.java rename to backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/OnTimerMethodAnnotation.java diff --git a/backend/manager/modules/beans/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/SchedulerUtil.java b/backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/SchedulerUtil.java similarity index 100% rename from backend/manager/modules/beans/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/SchedulerUtil.java rename to backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/SchedulerUtil.java diff --git a/backend/manager/modules/beans/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/SchedulerUtilQuartzImpl.java b/backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/SchedulerUtilQuartzImpl.java similarity index 100% rename from backend/manager/modules/beans/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/SchedulerUtilQuartzImpl.java rename to backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/SchedulerUtilQuartzImpl.java diff --git a/backend/manager/modules/beans/scheduler/src/main/modules/org/ovirt/engine/core/scheduler/main/module.xml b/backend/manager/modules/scheduler/src/main/modules/org/ovirt/engine/core/scheduler/main/module.xml similarity index 100% rename from backend/manager/modules/beans/scheduler/src/main/modules/org/ovirt/engine/core/scheduler/main/module.xml rename to backend/manager/modules/scheduler/src/main/modules/org/ovirt/engine/core/scheduler/main/module.xml diff --git a/backend/manager/modules/beans/scheduler/src/test/java/org/ovirt/engine/core/utils/timer/SchedulerUtilQuartsImplTest.java b/backend/manager/modules/scheduler/src/test/java/org/ovirt/engine/core/utils/timer/SchedulerUtilQuartsImplTest.java similarity index 100% rename from backend/manager/modules/beans/scheduler/src/test/java/org/ovirt/engine/core/utils/timer/SchedulerUtilQuartsImplTest.java rename to backend/manager/modules/scheduler/src/test/java/org/ovirt/engine/core/utils/timer/SchedulerUtilQuartsImplTest.java -- To view, visit http://gerrit.ovirt.org/13224 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I291a87742ddb2d536bd0d11f54515ac531b69659 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
