diff --git a/Makefile b/Makefile index 1b5eb0de31a..3c25b722fa7 100644 --- a/Makefile +++ b/Makefile @@ -452,7 +452,6 @@ install_poms: \ install -m 644 backend/manager/modules/bll/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)/bll.pom" install -m 644 backend/manager/modules/builtin-extensions/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)/builtin.pom" install -m 644 backend/manager/modules/dal/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)/dal.pom" - install -m 644 backend/manager/modules/scheduler/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)/scheduler.pom" install -m 644 backend/manager/modules/searchbackend/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)/searchbackend.pom" install -m 644 backend/manager/modules/vdsbroker/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)/vdsbroker.pom" # restapi diff --git a/backend/manager/modules/bll/pom.xml b/backend/manager/modules/bll/pom.xml index 742102d1294..009baea97b7 100644 --- a/backend/manager/modules/bll/pom.xml +++ b/backend/manager/modules/bll/pom.xml @@ -70,13 +70,6 @@ branding ${engine.version} - - ${engine.groupId} - scheduler - ${engine.version} - provided - ejb - ${engine.groupId} utils diff --git a/backend/manager/modules/pom.xml b/backend/manager/modules/pom.xml index 80d4175a656..e47bae6de63 100644 --- a/backend/manager/modules/pom.xml +++ b/backend/manager/modules/pom.xml @@ -24,7 +24,6 @@ dal vdsbroker builtin-extensions - scheduler searchbackend aaa auth-plugin diff --git a/backend/manager/modules/scheduler/exclude-filters.xml b/backend/manager/modules/scheduler/exclude-filters.xml deleted file mode 100644 index 43bc3321deb..00000000000 --- a/backend/manager/modules/scheduler/exclude-filters.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/backend/manager/modules/scheduler/pom.xml b/backend/manager/modules/scheduler/pom.xml deleted file mode 100644 index 847133c91a7..00000000000 --- a/backend/manager/modules/scheduler/pom.xml +++ /dev/null @@ -1,99 +0,0 @@ - - 4.0.0 - - - org.ovirt.engine.core - manager-modules - 4.5.7-SNAPSHOT - - - scheduler - jar - - engine scheduler bean - - pgsql - - - - ${engine.groupId} - utils - ${engine.version} - - - - - org.jboss.spec.javax.ejb - jboss-ejb-api_3.1_spec - - - - org.postgresql - postgresql - test - - - - - - src/test/filters/${engine.db}.properties - - - - src/main/resources - true - - - - - src/test/resources - true - - - - - maven-surefire-plugin - - - dao - - - - - maven-ejb-plugin - - 3.1 - true - - - false - - - org.slf4j - - - - - - - - - - enable-dao-tests - - - - maven-surefire-plugin - - - - src/test/resources/logging.properties - - - - - - - - - diff --git a/backend/manager/modules/scheduler/src/main/resources/META-INF/beans.xml b/backend/manager/modules/scheduler/src/main/resources/META-INF/beans.xml deleted file mode 100644 index 9a3bdf49edf..00000000000 --- a/backend/manager/modules/scheduler/src/main/resources/META-INF/beans.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/backend/manager/modules/scheduler/src/test/filters/pgsql.properties b/backend/manager/modules/scheduler/src/test/filters/pgsql.properties deleted file mode 100644 index 2621c47246f..00000000000 --- a/backend/manager/modules/scheduler/src/test/filters/pgsql.properties +++ /dev/null @@ -1,7 +0,0 @@ -engine.db.username = engine -engine.db.password = engine -engine.db.url = jdbc:postgresql://localhost/engine_dao_tests -engine.db.driver = org.postgresql.Driver -engine.db.datafactory = org.ovirt.engine.core.dao.PostgresDataTypeFactory -engine.db.initsql = -engine.db.dbengine.dialect=org.ovirt.engine.core.dal.dbbroker.PostgresDbEngineDialect diff --git a/backend/manager/modules/vdsbroker/pom.xml b/backend/manager/modules/vdsbroker/pom.xml index 1fa4e0aa539..3a66fc4c45e 100644 --- a/backend/manager/modules/vdsbroker/pom.xml +++ b/backend/manager/modules/vdsbroker/pom.xml @@ -33,13 +33,6 @@ dal ${engine.version} - - ${engine.groupId} - scheduler - ${engine.version} - provided - ejb - ${engine.groupId} utils diff --git a/ear/pom.xml b/ear/pom.xml index 0d775f6409d..e18c82ab5c7 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -20,12 +20,6 @@ - - org.ovirt.engine.core - scheduler - ${engine.version} - jar - org.ovirt.engine.core vdsbroker @@ -72,13 +66,6 @@ - - org.ovirt.engine.core - scheduler - ${engine.version} - ejb - - org.ovirt.engine.core bll @@ -199,7 +186,6 @@ *.war/**, META-INF/**, lib/vdsbroker.jar/**, - lib/scheduler.jar/**, diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index f90dd200135..4b0ad0a92f4 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -826,7 +826,6 @@ done << __EOF__ %{engine_data}/logutils/logutils.jar %{engine_ear}/bll.jar %{engine_ear}/lib/vdsbroker.jar -%{engine_ear}/lib/scheduler.jar %{engine_jboss_modules}/common/org/ovirt/engine/api/interface-common-jaxrs/main/interface-common-jaxrs.jar %{engine_jboss_modules}/common/org/ovirt/engine/api/restapi-definition/main/restapi-definition.jar %{engine_jboss_modules}/common/org/ovirt/engine/api/restapi-jaxrs/main/restapi-jaxrs.jar @@ -1128,14 +1127,12 @@ fi %{_mavenpomdir}/ovirt-engine/bll.pom %{_mavenpomdir}/ovirt-engine/builtin.pom %{_mavenpomdir}/ovirt-engine/dal.pom -%{_mavenpomdir}/ovirt-engine/scheduler.pom %{_mavenpomdir}/ovirt-engine/searchbackend.pom %{_mavenpomdir}/ovirt-engine/vdsbroker.pom %{_javadir}/ovirt-engine/aaa.jar %{_javadir}/ovirt-engine/bll.jar %{_javadir}/ovirt-engine/builtin.jar %{_javadir}/ovirt-engine/dal.jar -%{_javadir}/ovirt-engine/scheduler.jar %{_javadir}/ovirt-engine/searchbackend.jar %{_javadir}/ovirt-engine/vdsbroker.jar diff --git a/packaging/maven-metadata/ovirt-engine-backend.xml b/packaging/maven-metadata/ovirt-engine-backend.xml index 4a1c7bd5782..78789ca5de2 100644 --- a/packaging/maven-metadata/ovirt-engine-backend.xml +++ b/packaging/maven-metadata/ovirt-engine-backend.xml @@ -119,27 +119,6 @@ true - - org.ovirt.engine.core - scheduler - pom - 4.5.7-SNAPSHOT - /usr/share/maven-poms/ovirt-engine/scheduler.pom - e335a998-4048-429a-94fa-9021e47b2bd6 - - true - - - - org.ovirt.engine.core - scheduler - 4.5.7-SNAPSHOT - /usr/share/java/ovirt-engine/scheduler.jar - b1edfa78-a9ff-4786-bf64-0650a2320ef6 - - true - - org.ovirt.engine.core searchbackend