Alon Bar-Lev has uploaded a new change for review.
Change subject: aaa: prepare for new extension api
......................................................................
aaa: prepare for new extension api
rename current extension api to allow adding the new one.
Change-Id: Ib86bcf475a89a535eb2e379726e332c22f953e63
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
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/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java
M
backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/header/HeaderAuthenticator.java
M
backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthenticator.java
M
backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthenticator.java
M
backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapDirectory.java
M
backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapAuthenticateUserCommand.java
M
backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java
R
backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensionsold/AAAExtensionException.java
R
backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensionsold/Extension.java
M
backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
12 files changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/26434/1
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 d400117..d17132f 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
@@ -6,7 +6,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.ovirt.engine.api.extensions.Extension;
+import org.ovirt.engine.api.extensionsold.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 2d7a024..2616c8d 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
@@ -3,7 +3,7 @@
import java.util.List;
import java.util.Map;
-import org.ovirt.engine.api.extensions.Extension;
+import org.ovirt.engine.api.extensionsold.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/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java
index 1c154e7..136290a 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java
@@ -5,8 +5,8 @@
import java.util.List;
import org.apache.commons.lang.StringUtils;
-import org.ovirt.engine.api.extensions.AAAExtensionException;
-import org.ovirt.engine.api.extensions.AAAExtensionException.AAAExtensionError;
+import org.ovirt.engine.api.extensionsold.AAAExtensionException;
+import
org.ovirt.engine.api.extensionsold.AAAExtensionException.AAAExtensionError;
import org.ovirt.engine.core.aaa.AuthenticationProfile;
import org.ovirt.engine.core.aaa.AuthenticationProfileRepository;
import org.ovirt.engine.core.aaa.Authenticator;
diff --git
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/header/HeaderAuthenticator.java
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/header/HeaderAuthenticator.java
index acd6cdf..51a0853 100644
---
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/header/HeaderAuthenticator.java
+++
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/header/HeaderAuthenticator.java
@@ -5,7 +5,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.ovirt.engine.api.extensions.Extension.ExtensionProperties;
+import org.ovirt.engine.api.extensionsold.Extension.ExtensionProperties;
import org.ovirt.engine.core.aaa.Authenticator;
import org.ovirt.engine.core.aaa.NegotiationResult;
import org.slf4j.Logger;
diff --git
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthenticator.java
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthenticator.java
index c228c60..d209a6a 100644
---
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthenticator.java
+++
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthenticator.java
@@ -2,7 +2,7 @@
import java.util.Properties;
-import org.ovirt.engine.api.extensions.AAAExtensionException;
+import org.ovirt.engine.api.extensionsold.AAAExtensionException;
import org.ovirt.engine.core.aaa.Authenticator;
/**
diff --git
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthenticator.java
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthenticator.java
index 9629a96..4318a92 100644
---
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthenticator.java
+++
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthenticator.java
@@ -5,8 +5,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.ovirt.engine.api.extensions.AAAExtensionException;
-import org.ovirt.engine.api.extensions.AAAExtensionException.AAAExtensionError;
+import org.ovirt.engine.api.extensionsold.AAAExtensionException;
+import
org.ovirt.engine.api.extensionsold.AAAExtensionException.AAAExtensionError;
import org.ovirt.engine.core.aaa.Authenticator;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
diff --git
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapDirectory.java
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapDirectory.java
index c5a9d02..117a960 100644
---
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapDirectory.java
+++
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapDirectory.java
@@ -11,7 +11,7 @@
import org.ovirt.engine.core.common.businessentities.LdapGroup;
import org.ovirt.engine.core.common.businessentities.LdapUser;
import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.api.extensions.Extension.ExtensionProperties;
+import org.ovirt.engine.api.extensionsold.Extension.ExtensionProperties;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
diff --git
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapAuthenticateUserCommand.java
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapAuthenticateUserCommand.java
index 1d5ecbe..c891db2 100644
---
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapAuthenticateUserCommand.java
+++
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapAuthenticateUserCommand.java
@@ -5,8 +5,8 @@
import org.ovirt.engine.core.utils.kerberos.AuthenticationResult;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
-import org.ovirt.engine.api.extensions.AAAExtensionException;
-import org.ovirt.engine.api.extensions.AAAExtensionException.AAAExtensionError;
+import org.ovirt.engine.api.extensionsold.AAAExtensionException;
+import
org.ovirt.engine.api.extensionsold.AAAExtensionException.AAAExtensionError;
public class LdapAuthenticateUserCommand extends LdapBrokerCommandBase {
diff --git
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java
index e349d78..88a0eb9 100644
---
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java
+++
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java
@@ -7,7 +7,7 @@
import java.util.List;
import java.util.Map;
-import org.ovirt.engine.api.extensions.AAAExtensionException.AAAExtensionError;
+import
org.ovirt.engine.api.extensionsold.AAAExtensionException.AAAExtensionError;
import org.ovirt.engine.core.common.businessentities.LdapGroup;
import org.ovirt.engine.core.common.businessentities.LdapUser;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
diff --git
a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/AAAExtensionException.java
b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensionsold/AAAExtensionException.java
similarity index 94%
rename from
backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/AAAExtensionException.java
rename to
backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensionsold/AAAExtensionException.java
index b306cce..de2d3e5 100644
---
a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/AAAExtensionException.java
+++
b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensionsold/AAAExtensionException.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.api.extensions;
+package org.ovirt.engine.api.extensionsold;
public class AAAExtensionException extends RuntimeException {
diff --git
a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/Extension.java
b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensionsold/Extension.java
similarity index 95%
rename from
backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/Extension.java
rename to
backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensionsold/Extension.java
index f503835..1ae162d 100644
---
a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/Extension.java
+++
b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensionsold/Extension.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.api.extensions;
+package org.ovirt.engine.api.extensionsold;
import java.util.Map;
diff --git
a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
index 3816bb9..a744acb 100644
---
a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
+++
b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
@@ -17,8 +17,8 @@
import org.jboss.modules.ModuleIdentifier;
import org.jboss.modules.ModuleLoadException;
import org.jboss.modules.ModuleLoader;
-import org.ovirt.engine.api.extensions.Extension;
-import org.ovirt.engine.api.extensions.Extension.ExtensionProperties;
+import org.ovirt.engine.api.extensionsold.Extension;
+import org.ovirt.engine.api.extensionsold.Extension.ExtensionProperties;
import org.ovirt.engine.core.utils.EngineLocalConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
--
To view, visit http://gerrit.ovirt.org/26434
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib86bcf475a89a535eb2e379726e332c22f953e63
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
Gerrit-Reviewer: automat...@ovirt.org
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
