Yair Zaslavsky has uploaded a new change for review.
Change subject: aaa: Changing singletons to beans
......................................................................
aaa: Changing singletons to beans
Changing AuthenticationProfileRepsotiro and
ExtensionsManager to beans
topic: AAA
Change-Id: Iae3eeb7a487d58f59c4e75e3bf31ed10ac774142
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M backend/manager/modules/aaa/pom.xml
M
backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepository.java
A
backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepositoryLocal.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDomainListQueryTest.java
M backend/manager/modules/extensions-manager/pom.xml
M
backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
M
backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
A
backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManagerLocal.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ejb/BeanType.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ejb/EngineEJBUtilsStrategy.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockEJBStrategyRule.java
M ear/pom.xml
14 files changed, 189 insertions(+), 63 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/27348/1
diff --git a/backend/manager/modules/aaa/pom.xml
b/backend/manager/modules/aaa/pom.xml
index 8995bc2..fec3da1 100644
--- a/backend/manager/modules/aaa/pom.xml
+++ b/backend/manager/modules/aaa/pom.xml
@@ -12,7 +12,7 @@
</parent>
<artifactId>aaa</artifactId>
- <packaging>jar</packaging>
+ <packaging>ejb</packaging>
<name>Backend Authentication, Authorization and Accounting</name>
@@ -37,6 +37,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ </dependency>
+
+
+ <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
diff --git
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepository.java
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepository.java
index 40f9a17..81b3cfe 100644
---
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepository.java
+++
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepository.java
@@ -6,70 +6,62 @@
import java.util.Map;
import java.util.Properties;
+import javax.ejb.DependsOn;
+import javax.ejb.Singleton;
+import javax.ejb.Startup;
+
import org.ovirt.engine.api.extensions.Base;
import org.ovirt.engine.api.extensions.aaa.Authn;
import org.ovirt.engine.core.extensions.mgr.ConfigurationException;
import org.ovirt.engine.core.extensions.mgr.ExtensionProxy;
import org.ovirt.engine.core.extensions.mgr.ExtensionsManager;
+import org.ovirt.engine.core.utils.ejb.BeanProxyType;
+import org.ovirt.engine.core.utils.ejb.BeanType;
+import org.ovirt.engine.core.utils.ejb.EjbUtils;
-public class AuthenticationProfileRepository {
+@Singleton(name="AuthenticationProfileRepository")
+@Startup
+@DependsOn({ "ExtensionsManager" })
+public class AuthenticationProfileRepository implements
AuthenticationProfileRepositoryLocal {
private static final String AUTHN_SERVICE = Authn.class.getName();
private static final String AUTHN_AUTHZ_PLUGIN =
"ovirt.engine.aaa.authn.authz.plugin";
private static final String AUTHN_MAPPING_PLUGIN =
"ovirt.engine.aaa.authn.mapping.plugin";
- private static volatile AuthenticationProfileRepository instance = null;
+ private static volatile AuthenticationProfileRepositoryLocal instance =
null;
private Map<String, AuthenticationProfile> profiles = new HashMap<String,
AuthenticationProfile>();
-
- public static AuthenticationProfileRepository getInstance() {
- if (instance == null) {
- synchronized (AuthenticationProfileRepository.class) {
- if (instance == null) {
- instance = new AuthenticationProfileRepository();
- }
- }
- }
- return instance;
- }
-
- /**
- * Returns an unmodifiable list containing all the authentication profiles
that have been previously loaded.
- */
+ @Override
public List<AuthenticationProfile> getProfiles() {
return new ArrayList<>(profiles.values());
}
- /**
- * Gets the authentication profile for the given name.
- *
- * @param name
- * the name of the profile
- * @return the requested profile or {@code null} if no such profile can be
found
- */
+ @Override
public AuthenticationProfile getProfile(String name) {
return profiles.get(name);
}
+ @Override
public ExtensionProxy getAuthz(String name) {
return getProfile(name).getAuthz();
}
- /**
- * Register an authentication profile.
- * @param profile
- * the profile to register
- */
+ @Override
public void registerProfile(AuthenticationProfile profile) {
profiles.put(profile.getName(), profile);
}
+ public static AuthenticationProfileRepositoryLocal getInstance() {
+ return EjbUtils.findBean(BeanType.AUTHENTICATION_PROFILE_REPOSITORY,
BeanProxyType.LOCAL);
+ }
+
+ @Override
public void clear() {
profiles.clear();
}
- private AuthenticationProfileRepository() {
+ protected AuthenticationProfileRepository() {
createProfiles();
}
diff --git
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepositoryLocal.java
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepositoryLocal.java
new file mode 100644
index 0000000..8002cca
--- /dev/null
+++
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepositoryLocal.java
@@ -0,0 +1,37 @@
+package org.ovirt.engine.core.aaa;
+
+import java.util.List;
+
+import org.ovirt.engine.core.extensions.mgr.ExtensionProxy;
+
+public interface AuthenticationProfileRepositoryLocal {
+
+ public static final String JNDI_NAME =
+ "java:global/engine/aaa/AuthenticationProfileRepository";
+
+ /**
+ * Returns an unmodifiable list containing all the authentication profiles
that have been previously loaded.
+ */
+ public abstract List<AuthenticationProfile> getProfiles();
+
+ /**
+ * Gets the authentication profile for the given name.
+ *
+ * @param name
+ * the name of the profile
+ * @return the requested profile or {@code null} if no such profile can be
found
+ */
+ public abstract AuthenticationProfile getProfile(String name);
+
+ public abstract ExtensionProxy getAuthz(String name);
+
+ /**
+ * Register an authentication profile.
+ * @param profile
+ * the profile to register
+ */
+ public abstract void registerProfile(AuthenticationProfile profile);
+
+ public abstract void clear();
+
+}
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 2e5e18e..b6e884b 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
@@ -13,11 +13,9 @@
import javax.ejb.DependsOn;
import javax.ejb.Singleton;
import javax.ejb.Startup;
-
import org.ovirt.engine.api.extensions.Base;
import org.ovirt.engine.api.extensions.aaa.Authn;
import org.ovirt.engine.api.extensions.aaa.Authz;
-import org.ovirt.engine.core.aaa.AuthenticationProfileRepository;
import org.ovirt.engine.core.bll.dwh.DwhHeartBeat;
import org.ovirt.engine.core.bll.gluster.GlusterJobsManager;
import org.ovirt.engine.core.bll.job.ExecutionHandler;
@@ -46,7 +44,7 @@
*/
@Singleton
@Startup
-@DependsOn({ "Backend"})
+@DependsOn({ "Backend", "ExtensionsManager", "AuthenticationProfileRepository"
})
public class InitBackendServicesOnStartupBean implements
InitBackendServicesOnStartup{
private static final Logger log =
LoggerFactory.getLogger(InitBackendServicesOnStartupBean.class);
@@ -65,7 +63,6 @@
createInternalAAAConfigurations();
createKerberosLdapAAAConfigurations();
ExtensionsManager.getInstance().dump();
- AuthenticationProfileRepository.getInstance();
DbUserCacheManager.getInstance().init();
AsyncTaskManager.getInstance().initAsyncTaskManager();
ResourceManager.getInstance().init();
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 8364663..59a8ed2 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
@@ -7,7 +7,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.ovirt.engine.api.extensions.Base;
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDomainListQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDomainListQueryTest.java
index 0bf2ef9..15cbeb7 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDomainListQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDomainListQueryTest.java
@@ -5,28 +5,44 @@
import static org.mockito.Mockito.mock;
import static org.ovirt.engine.core.utils.MockConfigRule.mockConfig;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.List;
import org.apache.commons.collections.CollectionUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
+import org.junit.Rule;
import org.junit.Test;
import org.ovirt.engine.api.extensions.Base;
import org.ovirt.engine.api.extensions.ExtMap;
import org.ovirt.engine.core.aaa.AuthenticationProfile;
import org.ovirt.engine.core.aaa.AuthenticationProfileRepository;
+import org.ovirt.engine.core.aaa.AuthenticationProfileRepositoryLocal;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.queries.GetDomainListParameters;
import org.ovirt.engine.core.extensions.mgr.ExtensionProxy;
+import org.ovirt.engine.core.extensions.mgr.ExtensionsManagerLocal;
import org.ovirt.engine.core.utils.MockConfigRule;
+import org.ovirt.engine.core.utils.MockEJBStrategyRule;
+import org.ovirt.engine.core.utils.ejb.BeanType;
/**
* A test case for the {@link GetDomainListQuery} class.
*/
public class GetDomainListQueryTest
extends AbstractQueryTest<GetDomainListParameters,
GetDomainListQuery<GetDomainListParameters>> {
+
+ ExtensionsManagerLocal extMgr = mock(ExtensionsManagerLocal.class);
+
+ AuthenticationProfileRepositoryLocal repo =
mock(AuthenticationProfileRepositoryLocal.class);
+
+ @Rule
+ public MockEJBStrategyRule ejbRule =
+ new MockEJBStrategyRule(BeanType.EXTENSIONS_MANAGER,
extMgr).mockBean(BeanType.AUTHENTICATION_PROFILE_REPOSITORY,
+ repo);
// The name of the internal authentication profile:
private static final String INTERNAL = "internal";
@@ -47,9 +63,11 @@
@Override
public void setUp() throws Exception {
super.setUp();
+ List<AuthenticationProfile> profiles = new
ArrayList<AuthenticationProfile>();
for (String name : NAMES) {
- setUpProfileMock(name);
+ profiles.add(setUpProfileMock(name));
}
+ doReturn(profiles).when(repo).getProfiles();
}
/**
@@ -58,7 +76,7 @@
*
* @param name the name for the mocked authenticator, directory and
authentication profile
*/
- private void setUpProfileMock(String name) {
+ private AuthenticationProfile setUpProfileMock(String name) {
ExtensionProxy authzMock = mock(ExtensionProxy.class);
ExtMap mockContext = mock(ExtMap.class);
doReturn(name).when(mockContext).get(Base.ContextKeys.INSTANCE_NAME);
@@ -69,7 +87,7 @@
doReturn(name).when(profileMock).getName();
doReturn(authzMock).when(profileMock).getAuthz();
doReturn(authnMock).when(profileMock).getAuthn();
-
AuthenticationProfileRepository.getInstance().registerProfile(profileMock);
+ return profileMock;
}
@After
diff --git a/backend/manager/modules/extensions-manager/pom.xml
b/backend/manager/modules/extensions-manager/pom.xml
index d92f615..1cdabc8 100644
--- a/backend/manager/modules/extensions-manager/pom.xml
+++ b/backend/manager/modules/extensions-manager/pom.xml
@@ -12,7 +12,7 @@
</parent>
<artifactId>extensions-manager</artifactId>
- <packaging>jar</packaging>
+ <packaging>ejb</packaging>
<name>Extensions manager</name>
@@ -48,6 +48,12 @@
<artifactId>jboss-modules</artifactId>
<version>1.1.1.GA</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ </dependency>
+
</dependencies>
<build>
diff --git
a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
index 87ed5d5..0091332 100644
---
a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
+++
b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
@@ -12,7 +12,7 @@
private ExtMap context;
private void dumpMap(String prefix, ExtMap map) {
- Logger logger =
context.<Logger>get(ExtensionsManager.TRACE_LOG_CONTEXT_KEY);
+ Logger logger =
context.<Logger>get(ExtensionsManagerLocal.TRACE_LOG_CONTEXT_KEY);
if (logger.isDebugEnabled()) {
logger.debug(prefix + " BEGIN");
logger.debug(map.toString());
@@ -52,7 +52,7 @@
e.getMessage()
)
).mput(
- ExtensionsManager.CAUSE_OUTPUT_KEY,
+ ExtensionsManagerLocal.CAUSE_OUTPUT_KEY,
e
);
}
@@ -83,7 +83,7 @@
message == null ? "Invoke failed" : message,
input,
output,
- output.<Throwable>get(ExtensionsManager.CAUSE_OUTPUT_KEY)
+
output.<Throwable>get(ExtensionsManagerLocal.CAUSE_OUTPUT_KEY)
);
}
break;
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 1558134..7d31b26 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
@@ -14,27 +14,38 @@
import java.util.Properties;
import java.util.ServiceLoader;
+import javax.ejb.Singleton;
+import javax.ejb.Startup;
+
import org.jboss.modules.Module;
import org.jboss.modules.ModuleIdentifier;
import org.jboss.modules.ModuleLoadException;
import org.jboss.modules.ModuleLoader;
+import org.ovirt.engine.api.extensions.Base;
+import org.ovirt.engine.api.extensions.ExtKey;
+import org.ovirt.engine.api.extensions.ExtMap;
+import org.ovirt.engine.api.extensions.Extension;
import org.ovirt.engine.core.utils.EngineLocalConfig;
+import org.ovirt.engine.core.utils.ejb.BeanProxyType;
+import org.ovirt.engine.core.utils.ejb.BeanType;
+import org.ovirt.engine.core.utils.ejb.EjbUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-import org.ovirt.engine.api.extensions.Base;
-import org.ovirt.engine.api.extensions.ExtMap;
-import org.ovirt.engine.api.extensions.ExtKey;
-import org.ovirt.engine.api.extensions.Extension;
/**
* This class is responsible for loading the required {@code Configuration} in
order to create an extension. It holds
* the logic of ordering and solving conflicts during loading the configuration
*/
-public class ExtensionsManager {
+@Singleton(name = "ExtensionsManager")
+@Startup
+public class ExtensionsManager implements ExtensionsManagerLocal {
private static final String ENGINE_EXTENSION_ENABLED =
"ENGINE_EXTENSION_ENABLED_";
- public static final ExtKey TRACE_LOG_CONTEXT_KEY = new
ExtKey("EXTENSION_MANAGER_TRACE_LOG", Logger.class,
"863db666-3ea7-4751-9695-918a3197ad83");
- public static final ExtKey CAUSE_OUTPUT_KEY = new
ExtKey("EXTENSION_MANAGER_CAUSE_OUTPUT_KEY", Throwable.class,
"894e1c86-518b-40a2-a92b-29ea1eb0403d");
+ public static final ExtKey TRACE_LOG_CONTEXT_KEY = new
ExtKey("EXTENSION_MANAGER_TRACE_LOG",
+ Logger.class,
+ "863db666-3ea7-4751-9695-918a3197ad83");
+ public static final ExtKey CAUSE_OUTPUT_KEY = new
ExtKey("EXTENSION_MANAGER_CAUSE_OUTPUT_KEY",
+ Throwable.class,
+ "894e1c86-518b-40a2-a92b-29ea1eb0403d");
private static interface BindingsLoader {
Extension load(Properties props) throws Exception;
@@ -122,15 +133,8 @@
private Map<String, ExtensionEntry> loadedEntries = new HashMap<>();
private ExtMap globalContext = new
ExtMap().mput(Base.GlobalContextKeys.EXTENSIONS, new ArrayList<ExtMap>());
- public static ExtensionsManager getInstance() {
- if (instance == null) {
- synchronized (ExtensionsManager.class) {
- if (instance == null) {
- instance = new ExtensionsManager();
- }
- }
- }
- return instance;
+ public static ExtensionsManagerLocal getInstance() {
+ return EjbUtils.findBean(BeanType.EXTENSIONS_MANAGER,
BeanProxyType.LOCAL);
}
public List<ExtensionProxy> getProvidedExtensions(String provides) {
@@ -152,7 +156,7 @@
return result;
}
- private ExtensionsManager() {
+ protected ExtensionsManager() {
bindingsLoaders.put(Base.ConfigBindingsMethods.JBOSSMODULE, new
JBossBindingsLoader());
diff --git
a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManagerLocal.java
b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManagerLocal.java
new file mode 100644
index 0000000..99434e0
--- /dev/null
+++
b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManagerLocal.java
@@ -0,0 +1,32 @@
+package org.ovirt.engine.core.extensions.mgr;
+
+import java.io.File;
+import java.util.List;
+import java.util.Properties;
+
+import org.ovirt.engine.api.extensions.ExtKey;
+import org.slf4j.Logger;
+
+public interface ExtensionsManagerLocal {
+
+ public static final String JNDI_NAME =
+ "java:global/engine/extensions-manager/ExtensionsManager";
+
+ public static final ExtKey TRACE_LOG_CONTEXT_KEY = new
ExtKey("EXTENSION_MANAGER_TRACE_LOG",
+ Logger.class,
+ "863db666-3ea7-4751-9695-918a3197ad83");
+ public static final ExtKey CAUSE_OUTPUT_KEY = new
ExtKey("EXTENSION_MANAGER_CAUSE_OUTPUT_KEY",
+ Throwable.class,
+ "894e1c86-518b-40a2-a92b-29ea1eb0403d");
+
+ public abstract List<ExtensionProxy> getProvidedExtensions(String
provides);
+
+ public abstract ExtensionProxy getExtensionByName(String name) throws
ConfigurationException;
+
+ public abstract void load(Properties configuration);
+
+ public abstract void load(File file);
+
+ public abstract void dump();
+
+}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ejb/BeanType.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ejb/BeanType.java
index 1186080..974a6dd 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ejb/BeanType.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ejb/BeanType.java
@@ -12,6 +12,8 @@
VDS_EVENT_LISTENER,
LOCK_MANAGER,
EVENTQUEUE_MANAGER,
- CACHE_CONTAINER;
+ CACHE_CONTAINER,
+ AUTHENTICATION_PROFILE_REPOSITORY,
+ EXTENSIONS_MANAGER,
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ejb/EngineEJBUtilsStrategy.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ejb/EngineEJBUtilsStrategy.java
index 4c37350..fa66781 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ejb/EngineEJBUtilsStrategy.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ejb/EngineEJBUtilsStrategy.java
@@ -21,6 +21,8 @@
addBeanJNDIName(BeanType.LOCK_MANAGER,
ENGINE_CONTEXT_PREFIX.concat("bll/LockManager"));
addBeanJNDIName(BeanType.EVENTQUEUE_MANAGER,
ENGINE_CONTEXT_PREFIX.concat("bll/EventQueue"));
addBeanJNDIName(BeanType.CACHE_CONTAINER,
"java:jboss/infinispan/ovirt-engine");
+ addBeanJNDIName(BeanType.AUTHENTICATION_PROFILE_REPOSITORY,
ENGINE_CONTEXT_PREFIX.concat("aaa/AuthenticationProfileRepository"));
+ addBeanJNDIName(BeanType.EXTENSIONS_MANAGER,
ENGINE_CONTEXT_PREFIX.concat("extensions-manager/ExtensionsManager"));
}
@Override
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockEJBStrategyRule.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockEJBStrategyRule.java
index d358e80..49987f6 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockEJBStrategyRule.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockEJBStrategyRule.java
@@ -74,9 +74,10 @@
mockResource(ContainerManagedResourceType.TRANSACTION_MANAGER, tm);
}
- public void mockBean(BeanType type, Object bean) {
+ public MockEJBStrategyRule mockBean(BeanType type, Object bean) {
mockBeanMap.put(type, bean);
when(mockStrategy.findBean(eq(type),
any(BeanProxyType.class))).thenReturn(bean);
+ return this;
}
public void mockResource(ContainerManagedResourceType type, Object
resource) {
diff --git a/ear/pom.xml b/ear/pom.xml
index ce9b9ae..513d2de 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -92,6 +92,22 @@
<type>ejb</type>
</dependency>
+ <dependency>
+ <groupId>org.ovirt.engine.core</groupId>
+ <artifactId>extensions-manager</artifactId>
+ <version>${engine.version}</version>
+ <type>ejb</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ovirt.engine.core</groupId>
+ <artifactId>aaa</artifactId>
+ <version>${engine.version}</version>
+ <type>ejb</type>
+ </dependency>
+
+
+
<!-- ** JARs -->
<dependency>
<groupId>org.springframework</groupId>
@@ -258,6 +274,20 @@
<bundleFileName>bll.jar</bundleFileName>
</ejbModule>
+ <ejbModule>
+ <groupId>org.ovirt.engine.core</groupId>
+ <artifactId>extensions-manager</artifactId>
+ <bundleFileName>extensions-manager.jar</bundleFileName>
+ </ejbModule>
+
+ <ejbModule>
+ <groupId>org.ovirt.engine.core</groupId>
+ <artifactId>aaa</artifactId>
+ <bundleFileName>aaa.jar</bundleFileName>
+ </ejbModule>
+
+
+
</modules>
<!-- Add a the manifest that contains the required dependencies
--
To view, visit http://gerrit.ovirt.org/27348
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae3eeb7a487d58f59c4e75e3bf31ed10ac774142
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
