Yair Zaslavsky has uploaded a new change for review. Change subject: [WIP] core: creating extension-manager module ......................................................................
[WIP] core: creating extension-manager module This module will hold all required classes for loading and managing extensions. Currnently this contains the Manage, Factory, and the Configuration related classes. The patch deals with the following: a. Moving these classes to the new module and fixing imports all over the code accordingly b. Fixing the MANIFEST.MF of the ear to add dependency on the new module. c. Fixing the get-extension to compile against authentication module as well, as currently DirectoryManager code resides there and needed for custom serialization of DirectoryUser and DirectoryGroup d. Adding a module dependency for authentication - to be dependent on extension-manager Change-Id: I3c7258206880fd974934672de9fb5900192cca33 Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/authentication/pom.xml M backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticationProfileFactory.java M backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticationProfileManager.java R backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/Authenticator.java R backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticatorFactory.java M backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticatorManager.java R backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/DirectoryFactory.java R backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/DirectoryManager.java M backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/header/HeaderAuthenticatorFactory.java M backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/internal/InternalAuthenticatorFactory.java M backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/internal/InternalDirectoryFactory.java M backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/nop/NopAuthenticatorFactory.java M backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/nop/NopDirectoryFactory.java M backend/manager/modules/authentication/src/main/modules/org/ovirt/engine/core/authentication/main/module.xml M backend/manager/modules/bll/pom.xml M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/authentication/provisional/ProvisionalAuthenticatorFactory.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/authentication/provisional/ProvisionalDirectoryFactory.java A backend/manager/modules/extension-manager/pom.xml R backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Configuration.java R backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ConfigurationException.java R backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Factory.java R backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Manager.java R backend/manager/modules/extension-manager/src/test/java/org/ovirt/engine/core/extensions/mgr/ConfigurationTest.java M backend/manager/modules/pom.xml M ear/src/main/resources/META-INF/MANIFEST.MF M frontend/webadmin/modules/gwt-extension/pom.xml M frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/authentication/DirectoryGroup_CustomFieldSerializer.java M frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/authentication/DirectoryUser_CustomFieldSerializer.java 28 files changed, 115 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/93/24093/1 diff --git a/backend/manager/modules/authentication/pom.xml b/backend/manager/modules/authentication/pom.xml index e41e54b..d3b8822 100644 --- a/backend/manager/modules/authentication/pom.xml +++ b/backend/manager/modules/authentication/pom.xml @@ -23,6 +23,13 @@ <artifactId>common</artifactId> <version>${engine.version}</version> </dependency> + + <dependency> + <groupId>${engine.groupId}</groupId> + <artifactId>extension-manager</artifactId> + <version>${engine.version}</version> + </dependency> + <dependency> <groupId>org.jboss.spec.javax.servlet</groupId> diff --git a/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticationProfileFactory.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticationProfileFactory.java index 6ab488c..006c95b 100644 --- a/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticationProfileFactory.java +++ b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticationProfileFactory.java @@ -1,5 +1,8 @@ package org.ovirt.engine.core.authentication; +import org.ovirt.engine.core.extensions.mgr.Configuration; +import org.ovirt.engine.core.extensions.mgr.ConfigurationException; +import org.ovirt.engine.core.extensions.mgr.Factory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticationProfileManager.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticationProfileManager.java index 5e976ae..e1e5d96 100644 --- a/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticationProfileManager.java +++ b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticationProfileManager.java @@ -2,6 +2,13 @@ import java.util.List; +import org.ovirt.engine.core.extensions.mgr.Configuration; +import org.ovirt.engine.core.extensions.mgr.Factory; +import org.ovirt.engine.core.extensions.mgr.Manager; + + + + /** * The authentication profile manager is responsible for managing a set of authentication profiles. */ diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/Authenticator.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/Authenticator.java similarity index 100% rename from backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/Authenticator.java rename to backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/Authenticator.java diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/AuthenticatorFactory.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticatorFactory.java similarity index 82% rename from backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/AuthenticatorFactory.java rename to backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticatorFactory.java index 1e0a4a0..4b8e283 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/AuthenticatorFactory.java +++ b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticatorFactory.java @@ -1,5 +1,7 @@ package org.ovirt.engine.core.authentication; +import org.ovirt.engine.core.extensions.mgr.Factory; + /** * This is just a concrete realization of the generic interface intended to simplify things for developers of * authenticator factories. diff --git a/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticatorManager.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticatorManager.java index 9b9f696..7e4ee97 100644 --- a/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticatorManager.java +++ b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/AuthenticatorManager.java @@ -2,6 +2,11 @@ import java.util.List; +import org.ovirt.engine.core.extensions.mgr.Configuration; +import org.ovirt.engine.core.extensions.mgr.Manager; + + + /** * The authenticator manager is responsible for managing a collection of authenticator objects. */ diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/DirectoryFactory.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/DirectoryFactory.java similarity index 82% rename from backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/DirectoryFactory.java rename to backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/DirectoryFactory.java index 1619865..9511d46 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/DirectoryFactory.java +++ b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/DirectoryFactory.java @@ -1,5 +1,7 @@ package org.ovirt.engine.core.authentication; +import org.ovirt.engine.core.extensions.mgr.Factory; + /** * This is just a concrete realization of the generic interface intended to simplify things for developers of directory * factories. diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/DirectoryManager.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/DirectoryManager.java similarity index 94% rename from backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/DirectoryManager.java rename to backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/DirectoryManager.java index bd3a01e..9c2eca8 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/DirectoryManager.java +++ b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/DirectoryManager.java @@ -2,6 +2,9 @@ import java.util.List; +import org.ovirt.engine.core.extensions.mgr.Configuration; +import org.ovirt.engine.core.extensions.mgr.Manager; + /** * The directory manager is responsible for managing a collection of directory objects, like LDAP directories, for * example. diff --git a/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/header/HeaderAuthenticatorFactory.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/header/HeaderAuthenticatorFactory.java index 090c5e5..77765c8 100644 --- a/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/header/HeaderAuthenticatorFactory.java +++ b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/header/HeaderAuthenticatorFactory.java @@ -2,8 +2,8 @@ import org.ovirt.engine.core.authentication.Authenticator; import org.ovirt.engine.core.authentication.AuthenticatorFactory; -import org.ovirt.engine.core.authentication.Configuration; -import org.ovirt.engine.core.authentication.ConfigurationException; +import org.ovirt.engine.core.extensions.mgr.Configuration; +import org.ovirt.engine.core.extensions.mgr.ConfigurationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/internal/InternalAuthenticatorFactory.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/internal/InternalAuthenticatorFactory.java index cd62765..3bca711 100644 --- a/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/internal/InternalAuthenticatorFactory.java +++ b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/internal/InternalAuthenticatorFactory.java @@ -2,8 +2,8 @@ import org.ovirt.engine.core.authentication.Authenticator; import org.ovirt.engine.core.authentication.AuthenticatorFactory; -import org.ovirt.engine.core.authentication.Configuration; -import org.ovirt.engine.core.authentication.ConfigurationException; +import org.ovirt.engine.core.extensions.mgr.Configuration; +import org.ovirt.engine.core.extensions.mgr.ConfigurationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/internal/InternalDirectoryFactory.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/internal/InternalDirectoryFactory.java index 43b0230..2af7d97 100644 --- a/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/internal/InternalDirectoryFactory.java +++ b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/internal/InternalDirectoryFactory.java @@ -1,9 +1,9 @@ package org.ovirt.engine.core.authentication.internal; -import org.ovirt.engine.core.authentication.Configuration; -import org.ovirt.engine.core.authentication.ConfigurationException; import org.ovirt.engine.core.authentication.Directory; import org.ovirt.engine.core.authentication.DirectoryFactory; +import org.ovirt.engine.core.extensions.mgr.Configuration; +import org.ovirt.engine.core.extensions.mgr.ConfigurationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/nop/NopAuthenticatorFactory.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/nop/NopAuthenticatorFactory.java index 48ede30..b051123 100644 --- a/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/nop/NopAuthenticatorFactory.java +++ b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/nop/NopAuthenticatorFactory.java @@ -2,8 +2,8 @@ import org.ovirt.engine.core.authentication.Authenticator; import org.ovirt.engine.core.authentication.AuthenticatorFactory; -import org.ovirt.engine.core.authentication.Configuration; -import org.ovirt.engine.core.authentication.ConfigurationException; +import org.ovirt.engine.core.extensions.mgr.Configuration; +import org.ovirt.engine.core.extensions.mgr.ConfigurationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/nop/NopDirectoryFactory.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/nop/NopDirectoryFactory.java index 9246266..920d511 100644 --- a/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/nop/NopDirectoryFactory.java +++ b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/nop/NopDirectoryFactory.java @@ -1,9 +1,9 @@ package org.ovirt.engine.core.authentication.nop; -import org.ovirt.engine.core.authentication.Configuration; -import org.ovirt.engine.core.authentication.ConfigurationException; import org.ovirt.engine.core.authentication.Directory; import org.ovirt.engine.core.authentication.DirectoryFactory; +import org.ovirt.engine.core.extensions.mgr.Configuration; +import org.ovirt.engine.core.extensions.mgr.ConfigurationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/backend/manager/modules/authentication/src/main/modules/org/ovirt/engine/core/authentication/main/module.xml b/backend/manager/modules/authentication/src/main/modules/org/ovirt/engine/core/authentication/main/module.xml index dba907f..73c5ab1 100644 --- a/backend/manager/modules/authentication/src/main/modules/org/ovirt/engine/core/authentication/main/module.xml +++ b/backend/manager/modules/authentication/src/main/modules/org/ovirt/engine/core/authentication/main/module.xml @@ -11,6 +11,7 @@ <module name="javax.servlet.api"/> <module name="org.apache.commons.lang"/> <module name="org.ovirt.engine.core.common"/> + <module name="org.ovirt.engine.core.extension-manager"/> <module name="org.slf4j"/> </dependencies> diff --git a/backend/manager/modules/bll/pom.xml b/backend/manager/modules/bll/pom.xml index 5c84323..8842ca4 100644 --- a/backend/manager/modules/bll/pom.xml +++ b/backend/manager/modules/bll/pom.xml @@ -35,6 +35,11 @@ <artifactId>authentication</artifactId> <version>${engine.version}</version> </dependency> + <dependency> + <groupId>${engine.groupId}</groupId> + <artifactId>extension-manager</artifactId> + <version>${engine.version}</version> + </dependency> <dependency> diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/authentication/provisional/ProvisionalAuthenticatorFactory.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/authentication/provisional/ProvisionalAuthenticatorFactory.java index 6640f6f..1f3737a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/authentication/provisional/ProvisionalAuthenticatorFactory.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/authentication/provisional/ProvisionalAuthenticatorFactory.java @@ -2,10 +2,10 @@ import org.ovirt.engine.core.authentication.Authenticator; import org.ovirt.engine.core.authentication.AuthenticatorFactory; -import org.ovirt.engine.core.authentication.Configuration; -import org.ovirt.engine.core.authentication.ConfigurationException; import org.ovirt.engine.core.bll.adbroker.LdapBroker; import org.ovirt.engine.core.bll.adbroker.LdapFactory; +import org.ovirt.engine.core.extensions.mgr.Configuration; +import org.ovirt.engine.core.extensions.mgr.ConfigurationException; 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/authentication/provisional/ProvisionalDirectoryFactory.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/authentication/provisional/ProvisionalDirectoryFactory.java index db1e8f5..6f1ff02 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/authentication/provisional/ProvisionalDirectoryFactory.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/authentication/provisional/ProvisionalDirectoryFactory.java @@ -1,11 +1,11 @@ package org.ovirt.engine.core.authentication.provisional; -import org.ovirt.engine.core.authentication.Configuration; -import org.ovirt.engine.core.authentication.ConfigurationException; import org.ovirt.engine.core.authentication.Directory; import org.ovirt.engine.core.authentication.DirectoryFactory; import org.ovirt.engine.core.bll.adbroker.LdapBroker; import org.ovirt.engine.core.bll.adbroker.LdapFactory; +import org.ovirt.engine.core.extensions.mgr.Configuration; +import org.ovirt.engine.core.extensions.mgr.ConfigurationException; /** * This is the factory for the bridge between the new directory interface and the existing LDAP infrastructure. It diff --git a/backend/manager/modules/extension-manager/pom.xml b/backend/manager/modules/extension-manager/pom.xml new file mode 100644 index 0000000..5b09896 --- /dev/null +++ b/backend/manager/modules/extension-manager/pom.xml @@ -0,0 +1,46 @@ +<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.5.0-SNAPSHOT</version> + </parent> + + <artifactId>extension-manager</artifactId> + <packaging>jar</packaging> + + <name>Extension manager</name> + + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.modules</groupId> + <artifactId>jboss-modules</artifactId> + <version>1.1.1.GA</version> + </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/common/src/main/java/org/ovirt/engine/core/authentication/Configuration.java b/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Configuration.java similarity index 99% rename from backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/Configuration.java rename to backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Configuration.java index ce464dc..2a97e1b 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/Configuration.java +++ b/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Configuration.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.authentication; +package org.ovirt.engine.core.extensions.mgr; import java.io.File; import java.io.FileInputStream; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/ConfigurationException.java b/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ConfigurationException.java similarity index 88% rename from backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/ConfigurationException.java rename to backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ConfigurationException.java index e29d208..f02b9b0 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/ConfigurationException.java +++ b/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ConfigurationException.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.authentication; +package org.ovirt.engine.core.extensions.mgr; public class ConfigurationException extends RuntimeException { public ConfigurationException() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/Factory.java b/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Factory.java similarity index 95% rename from backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/Factory.java rename to backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Factory.java index d9b6d65..7a34ea4 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/Factory.java +++ b/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Factory.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.authentication; +package org.ovirt.engine.core.extensions.mgr; /** * This interface is to be implemented by the classes that create objects using a configuration file. diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/Manager.java b/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Manager.java similarity index 99% rename from backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/Manager.java rename to backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Manager.java index 2ebc98b..3aa2c15 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/authentication/Manager.java +++ b/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Manager.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.authentication; +package org.ovirt.engine.core.extensions.mgr; import static java.util.Arrays.sort; diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/authentication/ConfigurationTest.java b/backend/manager/modules/extension-manager/src/test/java/org/ovirt/engine/core/extensions/mgr/ConfigurationTest.java similarity index 99% rename from backend/manager/modules/common/src/test/java/org/ovirt/engine/core/authentication/ConfigurationTest.java rename to backend/manager/modules/extension-manager/src/test/java/org/ovirt/engine/core/extensions/mgr/ConfigurationTest.java index 34e2c74..7f5f59c 100644 --- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/authentication/ConfigurationTest.java +++ b/backend/manager/modules/extension-manager/src/test/java/org/ovirt/engine/core/extensions/mgr/ConfigurationTest.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.authentication; +package org.ovirt.engine.core.extensions.mgr; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; diff --git a/backend/manager/modules/pom.xml b/backend/manager/modules/pom.xml index 95d47c1..08debda 100644 --- a/backend/manager/modules/pom.xml +++ b/backend/manager/modules/pom.xml @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <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/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> @@ -29,6 +30,7 @@ <module>docs</module> <module>welcome</module> <module>authentication</module> + <module>extension-manager</module> </modules> <dependencies> @@ -48,4 +50,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 a42f573..7d86534 100644 --- a/ear/src/main/resources/META-INF/MANIFEST.MF +++ b/ear/src/main/resources/META-INF/MANIFEST.MF @@ -22,6 +22,7 @@ org.ovirt.otopi, org.ovirt.ovirt-host-deploy, org.ovirt.engine.core.authentication, + org.ovirt.engine.core.extension-manager, org.quartz, org.springframework, com.woorea.openstack.sdk services, diff --git a/frontend/webadmin/modules/gwt-extension/pom.xml b/frontend/webadmin/modules/gwt-extension/pom.xml index c24aa92..8c2ba59 100644 --- a/frontend/webadmin/modules/gwt-extension/pom.xml +++ b/frontend/webadmin/modules/gwt-extension/pom.xml @@ -35,6 +35,13 @@ </dependency> <dependency> <groupId>${engine.core.groupId}</groupId> + <artifactId>authentication</artifactId> + <version>${engine.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>${engine.core.groupId}</groupId> <artifactId>utils</artifactId> <version>${engine.version}</version> <scope>provided</scope> diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/authentication/DirectoryGroup_CustomFieldSerializer.java b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/authentication/DirectoryGroup_CustomFieldSerializer.java index 6fdca7c..7afe4dd 100644 --- a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/authentication/DirectoryGroup_CustomFieldSerializer.java +++ b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/authentication/DirectoryGroup_CustomFieldSerializer.java @@ -1,9 +1,10 @@ package org.ovirt.engine.core.authentication; +import org.ovirt.engine.core.common.utils.ExternalId; + import com.google.gwt.user.client.rpc.SerializationException; import com.google.gwt.user.client.rpc.SerializationStreamReader; import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import org.ovirt.engine.core.common.utils.ExternalId; /** * We use a custom serializer for directory groups because we want to avoid having no args constructor. diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/authentication/DirectoryUser_CustomFieldSerializer.java b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/authentication/DirectoryUser_CustomFieldSerializer.java index f5bf229..38ea833 100644 --- a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/authentication/DirectoryUser_CustomFieldSerializer.java +++ b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/authentication/DirectoryUser_CustomFieldSerializer.java @@ -1,9 +1,10 @@ package org.ovirt.engine.core.authentication; +import org.ovirt.engine.core.common.utils.ExternalId; + import com.google.gwt.user.client.rpc.SerializationException; import com.google.gwt.user.client.rpc.SerializationStreamReader; import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import org.ovirt.engine.core.common.utils.ExternalId; /** * We use a custom serializer for directory users because we want to replace the directory reference with the name of -- To view, visit http://gerrit.ovirt.org/24093 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c7258206880fd974934672de9fb5900192cca33 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
