Yair Zaslavsky has uploaded a new change for review. Change subject: aaa: Introducing built-in extensions module ......................................................................
aaa: Introducing built-in extensions module This patch introduces a module with built in extensions (Ldap/Kerberos and Internal) Change-Id: If7ea408b46548ffdad1bf56fb8ab54b68722a480 Topic: AAA Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com> --- D backend/manager/modules/aaa/src/main/resources/META-INF/services/org.ovirt.engine.api.extensions.Extension A backend/manager/modules/builtin-extensions/pom.xml R backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/core/extensions/aaa/internal/InternalAuthenticator.java R backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/core/extensions/aaa/internal/InternalDirectory.java A backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/core/extensions/main/module.xml A backend/manager/modules/builtin-extensions/src/main/resources/META-INF/services/org.ovirt.engine.api.extensions.Extension M backend/manager/modules/pom.xml 7 files changed, 79 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/25253/1 diff --git a/backend/manager/modules/aaa/src/main/resources/META-INF/services/org.ovirt.engine.api.extensions.Extension b/backend/manager/modules/aaa/src/main/resources/META-INF/services/org.ovirt.engine.api.extensions.Extension deleted file mode 100644 index bdc1517..0000000 --- a/backend/manager/modules/aaa/src/main/resources/META-INF/services/org.ovirt.engine.api.extensions.Extension +++ /dev/null @@ -1,2 +0,0 @@ -org.ovirt.engine.core.aaa.internal.InternalAuthenticator -org.ovirt.engine.core.aaa.internal.InternalDirectory diff --git a/backend/manager/modules/builtin-extensions/pom.xml b/backend/manager/modules/builtin-extensions/pom.xml new file mode 100644 index 0000000..e71af4a --- /dev/null +++ b/backend/manager/modules/builtin-extensions/pom.xml @@ -0,0 +1,53 @@ +<?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>builtin-extensions</artifactId> + <name>builtin-extensions</name> + <dependencies> + <dependency> + <groupId>${engine.groupId}</groupId> + <artifactId>compat</artifactId> + <version>${engine.version}</version> + </dependency> + <dependency> + <groupId>${engine.groupId}</groupId> + <artifactId>common</artifactId> + <version>${engine.version}</version> + </dependency> + <dependency> + <groupId>${engine.groupId}</groupId> + <artifactId>utils</artifactId> + <version>${engine.version}</version> + </dependency> + <dependency> + <groupId>org.ovirt.engine.api</groupId> + <artifactId>extensions</artifactId> + <version>${org.ovirt.engine.api.extensions.version}</version> + </dependency> + <dependency> + <groupId>org.ovirt.engine.core</groupId> + <artifactId>aaa</artifactId> + <version>${engine.version}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <!-- Create the JBoss module: --> + <plugin> + <groupId>org.ovirt.engine</groupId> + <artifactId>jboss-modules-maven-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalAuthenticator.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/core/extensions/aaa/internal/InternalAuthenticator.java similarity index 96% rename from backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalAuthenticator.java rename to backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/core/extensions/aaa/internal/InternalAuthenticator.java index 1aace46..f4d3ef5 100644 --- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalAuthenticator.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/core/extensions/aaa/internal/InternalAuthenticator.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.aaa.internal; +package org.ovirt.engine.core.extensions.aaa.internal; import org.apache.commons.lang.ObjectUtils; import org.ovirt.engine.core.aaa.AuthenticationResult; diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/core/extensions/aaa/internal/InternalDirectory.java similarity index 97% rename from backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java rename to backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/core/extensions/aaa/internal/InternalDirectory.java index 7fa7584..7630094 100644 --- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/core/extensions/aaa/internal/InternalDirectory.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.aaa.internal; +package org.ovirt.engine.core.extensions.aaa.internal; import java.util.ArrayList; import java.util.Collections; diff --git a/backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/core/extensions/main/module.xml b/backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/core/extensions/main/module.xml new file mode 100644 index 0000000..df9e21b --- /dev/null +++ b/backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/core/extensions/main/module.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<module xmlns="urn:jboss:module:1.1" name="org.ovirt.engine.core.extensions"> + + <resources> + <resource-root path="builtin-extensions.jar"/> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.servlet.api"/> + <module name="org.apache.commons.lang"/> + <module name="org.ovirt.engine.core.common"/> + <module name="org.ovirt.engine.core.compat"/> + <module name="org.ovirt.engine.core.utils"/> + <module name="org.ovirt.engine.api.extensions"/> + <module name="org.slf4j"/> + </dependencies> + +</module> diff --git a/backend/manager/modules/builtin-extensions/src/main/resources/META-INF/services/org.ovirt.engine.api.extensions.Extension b/backend/manager/modules/builtin-extensions/src/main/resources/META-INF/services/org.ovirt.engine.api.extensions.Extension new file mode 100644 index 0000000..602430c --- /dev/null +++ b/backend/manager/modules/builtin-extensions/src/main/resources/META-INF/services/org.ovirt.engine.api.extensions.Extension @@ -0,0 +1,2 @@ +org.ovirt.engine.core.extensions.aaa.internal.InternalAuthenticator +org.ovirt.engine.core.extensions.aaa.internal.InternalDirectory diff --git a/backend/manager/modules/pom.xml b/backend/manager/modules/pom.xml index 7c02ac7..0e652ea 100644 --- a/backend/manager/modules/pom.xml +++ b/backend/manager/modules/pom.xml @@ -32,6 +32,7 @@ <module>services</module> <module>docs</module> <module>welcome</module> + <module>builtin-extensions</module> </modules> <dependencies> @@ -54,4 +55,4 @@ </plugins> </build> -</project> +</project> \ No newline at end of file -- To view, visit http://gerrit.ovirt.org/25253 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7ea408b46548ffdad1bf56fb8ab54b68722a480 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
