Yair Zaslavsky has uploaded a new change for review. Change subject: aaa: Introducing extensions-api module ......................................................................
aaa: Introducing extensions-api module The extensios-api will hold all the relevant API needed to develop extensions. Currently it holds the Extension interface Change-Id: If373ef883588fdf363f5800fa8fc74c7836838cd Topic: AAA Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/aaa/pom.xml M backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/Authenticator.java M backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/Directory.java M backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java M backend/manager/modules/aaa/src/main/modules/org/ovirt/engine/core/aaa/main/module.xml M backend/manager/modules/bll/pom.xml M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalAuthenticator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalDirectory.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java M backend/manager/modules/extension-manager/pom.xml M backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionManager.java M backend/manager/modules/extension-manager/src/main/modules/org/ovirt/engine/core/extension-manager/main/module.xml A backend/manager/modules/extensions-api/pom.xml R backend/manager/modules/extensions-api/src/main/java/org/ovirt/engine/core/extensions/api/Extension.java A backend/manager/modules/extensions-api/src/main/modules/org/ovirt/engine/core/extensions-api/main/module.xml M backend/manager/modules/pom.xml M ear/src/main/resources/META-INF/MANIFEST.MF 17 files changed, 107 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/25192/1 diff --git a/backend/manager/modules/aaa/pom.xml b/backend/manager/modules/aaa/pom.xml index 7c41a76..bfb1859 100644 --- a/backend/manager/modules/aaa/pom.xml +++ b/backend/manager/modules/aaa/pom.xml @@ -29,6 +29,13 @@ <artifactId>extension-manager</artifactId> <version>${engine.version}</version> </dependency> + + <dependency> + <groupId>${engine.groupId}</groupId> + <artifactId>extensions-api</artifactId> + <version>${engine.version}</version> + </dependency> + <dependency> <groupId>org.jboss.spec.javax.servlet</groupId> diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/Authenticator.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/Authenticator.java index 896f668..21cbe24 100644 --- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/Authenticator.java +++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/Authenticator.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.Properties; -import org.ovirt.engine.core.extensions.mgr.Extension; +import org.ovirt.engine.core.extensions.api.Extension; /** * A authenticator is an object used to verify an identity. diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/Directory.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/Directory.java index 6ed8a36..e9e0d96 100644 --- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/Directory.java +++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/Directory.java @@ -5,7 +5,7 @@ import java.util.Properties; import org.ovirt.engine.core.common.utils.ExternalId; -import org.ovirt.engine.core.extensions.mgr.Extension; +import org.ovirt.engine.core.extensions.api.Extension; /** * A directory is an object that manages a collection of users and groups, usually stored in an external system like an diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java index 9855849..0314ffe 100644 --- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java +++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java @@ -10,7 +10,7 @@ import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.utils.ExternalId; -import org.ovirt.engine.core.extensions.mgr.Extension.ExtensionProperties; +import org.ovirt.engine.core.extensions.api.Extension.ExtensionProperties; /** * This directory contains only the internal user as specified in the {@code AdminUser} configuration parameter. diff --git a/backend/manager/modules/aaa/src/main/modules/org/ovirt/engine/core/aaa/main/module.xml b/backend/manager/modules/aaa/src/main/modules/org/ovirt/engine/core/aaa/main/module.xml index 2f6e2f9..ec3efc0 100644 --- a/backend/manager/modules/aaa/src/main/modules/org/ovirt/engine/core/aaa/main/module.xml +++ b/backend/manager/modules/aaa/src/main/modules/org/ovirt/engine/core/aaa/main/module.xml @@ -9,6 +9,7 @@ <dependencies> <module name="javax.api"/> <module name="javax.servlet.api"/> + <module name="org.ovirt.engine.core.extensions-api"/> <module name="org.apache.commons.lang"/> <module name="org.ovirt.engine.core.common"/> <module name="org.ovirt.engine.core.extension-manager"/> diff --git a/backend/manager/modules/bll/pom.xml b/backend/manager/modules/bll/pom.xml index 1f00ecd..c44f7c1 100644 --- a/backend/manager/modules/bll/pom.xml +++ b/backend/manager/modules/bll/pom.xml @@ -42,6 +42,11 @@ </dependency> <dependency> <groupId>${engine.groupId}</groupId> + <artifactId>extensions-api</artifactId> + <version>${engine.version}</version> + </dependency> + <dependency> + <groupId>${engine.groupId}</groupId> <artifactId>utils</artifactId> <version>${engine.version}</version> </dependency> diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalAuthenticator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalAuthenticator.java index c7a4ef7..a9eeaa5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalAuthenticator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalAuthenticator.java @@ -8,7 +8,6 @@ import org.ovirt.engine.core.bll.adbroker.LdapReturnValueBase; import org.ovirt.engine.core.bll.adbroker.LdapUserPasswordBaseParameters; import org.ovirt.engine.core.bll.adbroker.UserAuthenticationResult; -import org.ovirt.engine.core.extensions.mgr.Extension.ExtensionProperties; /** * This authenticator implementation is a bridge between the new directory interface and the existing LDAP diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalDirectory.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalDirectory.java index 34b0283..300c930 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalDirectory.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalDirectory.java @@ -20,7 +20,7 @@ import org.ovirt.engine.core.common.businessentities.LdapGroup; import org.ovirt.engine.core.common.businessentities.LdapUser; import org.ovirt.engine.core.common.utils.ExternalId; -import org.ovirt.engine.core.extensions.mgr.Extension.ExtensionProperties; +import org.ovirt.engine.core.extensions.api.Extension.ExtensionProperties; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java index 6bdcdb3..dc26c27 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java @@ -30,7 +30,7 @@ import org.ovirt.engine.core.common.action.MigrateVmParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.extensions.mgr.Extension.ExtensionProperties; +import org.ovirt.engine.core.extensions.api.Extension.ExtensionProperties; import org.ovirt.engine.core.utils.customprop.DevicePropertiesUtils; import org.ovirt.engine.core.utils.customprop.VmPropertiesUtils; import org.ovirt.engine.core.utils.exceptions.InitializationException; diff --git a/backend/manager/modules/extension-manager/pom.xml b/backend/manager/modules/extension-manager/pom.xml index 5009815..cfee7eb 100644 --- a/backend/manager/modules/extension-manager/pom.xml +++ b/backend/manager/modules/extension-manager/pom.xml @@ -34,6 +34,11 @@ <version>${engine.version}</version> </dependency> <dependency> + <groupId>${engine.groupId}</groupId> + <artifactId>extensions-api</artifactId> + <version>${engine.version}</version> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> </dependency> diff --git a/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionManager.java b/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionManager.java index 89b8d47..37256d2 100644 --- a/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionManager.java +++ b/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionManager.java @@ -17,7 +17,8 @@ import org.jboss.modules.ModuleIdentifier; import org.jboss.modules.ModuleLoadException; import org.jboss.modules.ModuleLoader; -import org.ovirt.engine.core.extensions.mgr.Extension.ExtensionProperties; +import org.ovirt.engine.core.extensions.api.Extension.ExtensionProperties; +import org.ovirt.engine.core.extensions.api.Extension; import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.collections.MultiValueMapUtils; import org.slf4j.Logger; diff --git a/backend/manager/modules/extension-manager/src/main/modules/org/ovirt/engine/core/extension-manager/main/module.xml b/backend/manager/modules/extension-manager/src/main/modules/org/ovirt/engine/core/extension-manager/main/module.xml index c6be94a..ec9d1fa 100644 --- a/backend/manager/modules/extension-manager/src/main/modules/org/ovirt/engine/core/extension-manager/main/module.xml +++ b/backend/manager/modules/extension-manager/src/main/modules/org/ovirt/engine/core/extension-manager/main/module.xml @@ -11,6 +11,7 @@ <module name="javax.servlet.api"/> <module name="org.apache.commons.lang"/> <module name="org.jboss.modules"/> + <module name="org.ovirt.engine.core.extensions-api"/> <module name="org.ovirt.engine.core.utils"/> <module name="org.slf4j"/> </dependencies> diff --git a/backend/manager/modules/extensions-api/pom.xml b/backend/manager/modules/extensions-api/pom.xml new file mode 100644 index 0000000..be67fc8 --- /dev/null +++ b/backend/manager/modules/extensions-api/pom.xml @@ -0,0 +1,69 @@ +<?xml version="1.0"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.ovirt.engine.core</groupId> + <artifactId>manager-modules</artifactId> + <version>3.5.0-SNAPSHOT</version> + </parent> + + <artifactId>extensions-api</artifactId> + <packaging>jar</packaging> + + <name>extensions-api</name> + + <build> + <plugins> + <!-- Create the JBoss module: --> + <plugin> + <groupId>org.ovirt.engine</groupId> + <artifactId>jboss-modules-maven-plugin</artifactId> + </plugin> + + </plugins> + + </build> + <profiles> + <profile> + <id>findbugs</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>${findbugs.version}</version> + <configuration> + <xmlOutput>true</xmlOutput> + <!-- Optional directory to put findbugs xdoc xml report --> + <excludeFilterFile> ${basedir}/exclude-filters.xml</excludeFilterFile> + <xmlOutputDirectory>target/site</xmlOutputDirectory> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>findbugs-general</id> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>${findbugs.version}</version> + <configuration> + <xmlOutput>true</xmlOutput> + <!-- Optional directory to put findbugs xdoc xml report --> + <excludeFilterFile> ${basedir}/exclude-filters.xml, ${basedir}/../../../../exclude-filters-general.xml</excludeFilterFile> + <xmlOutputDirectory>target/site</xmlOutputDirectory> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> diff --git a/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Extension.java b/backend/manager/modules/extensions-api/src/main/java/org/ovirt/engine/core/extensions/api/Extension.java similarity index 92% rename from backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Extension.java rename to backend/manager/modules/extensions-api/src/main/java/org/ovirt/engine/core/extensions/api/Extension.java index 8d64e55..4587d5e 100644 --- a/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Extension.java +++ b/backend/manager/modules/extensions-api/src/main/java/org/ovirt/engine/core/extensions/api/Extension.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.extensions.mgr; +package org.ovirt.engine.core.extensions.api; import java.util.Map; diff --git a/backend/manager/modules/extensions-api/src/main/modules/org/ovirt/engine/core/extensions-api/main/module.xml b/backend/manager/modules/extensions-api/src/main/modules/org/ovirt/engine/core/extensions-api/main/module.xml new file mode 100644 index 0000000..c12edf9 --- /dev/null +++ b/backend/manager/modules/extensions-api/src/main/modules/org/ovirt/engine/core/extensions-api/main/module.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<module xmlns="urn:jboss:module:1.1" name="org.ovirt.engine.core.extensions-api"> + + <resources> + <resource-root path="extensions-api.jar"/> + </resources> +</module> diff --git a/backend/manager/modules/pom.xml b/backend/manager/modules/pom.xml index 7c66b9f..2b5e766 100644 --- a/backend/manager/modules/pom.xml +++ b/backend/manager/modules/pom.xml @@ -31,6 +31,7 @@ <module>welcome</module> <module>aaa</module> <module>extension-manager</module> + <module>extensions-api</module> </modules> <dependencies> @@ -53,4 +54,4 @@ </plugins> </build> -</project> +</project> \ No newline at end of file diff --git a/ear/src/main/resources/META-INF/MANIFEST.MF b/ear/src/main/resources/META-INF/MANIFEST.MF index c925267..a41b333 100644 --- a/ear/src/main/resources/META-INF/MANIFEST.MF +++ b/ear/src/main/resources/META-INF/MANIFEST.MF @@ -23,6 +23,7 @@ org.ovirt.ovirt-host-deploy, org.ovirt.engine.core.aaa, org.ovirt.engine.core.extension-manager, + org.ovirt.engine.core.extensions-api, org.quartz, org.springframework, com.woorea.openstack.sdk services, -- To view, visit http://gerrit.ovirt.org/25192 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If373ef883588fdf363f5800fa8fc74c7836838cd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
