Repository: ambari Updated Branches: refs/heads/trunk 133d7d55d -> 1cd926ef9
AMBARI-4791. API call to restart all components on one or more hosts should result in one request. Unit test fix. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1cd926ef Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1cd926ef Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1cd926ef Branch: refs/heads/trunk Commit: 1cd926ef91fc7e6ad4bbe7e7d336c15fcef30ed4 Parents: 133d7d5 Author: Siddharth Wagle <[email protected]> Authored: Fri Feb 28 12:49:55 2014 -0800 Committer: Siddharth Wagle <[email protected]> Committed: Fri Feb 28 12:49:55 2014 -0800 ---------------------------------------------------------------------- .../org/apache/ambari/server/controller/ControllerModule.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1cd926ef/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java index adb78c3..98a7086 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java @@ -19,6 +19,7 @@ package org.apache.ambari.server.controller; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.google.inject.AbstractModule; import com.google.inject.Scopes; import com.google.inject.assistedinject.FactoryModuleBuilder; @@ -37,6 +38,8 @@ import org.apache.ambari.server.controller.internal.HostComponentResourceProvide import org.apache.ambari.server.controller.internal.HostResourceProvider; import org.apache.ambari.server.controller.internal.ServiceResourceProvider; import org.apache.ambari.server.controller.spi.ResourceProvider; +import org.apache.ambari.server.orm.DBAccessor; +import org.apache.ambari.server.orm.DBAccessorImpl; import org.apache.ambari.server.orm.PersistenceType; import org.apache.ambari.server.scheduler.ExecutionScheduler; import org.apache.ambari.server.scheduler.ExecutionSchedulerImpl; @@ -70,13 +73,10 @@ import org.apache.ambari.server.state.scheduler.RequestExecutionImpl; import org.apache.ambari.server.state.svccomphost.ServiceComponentHostImpl; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.StandardPasswordEncoder; - import java.security.SecureRandom; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; - -import com.google.gson.GsonBuilder; import static org.eclipse.persistence.config.PersistenceUnitProperties.CREATE_JDBC_DDL_FILE; import static org.eclipse.persistence.config.PersistenceUnitProperties.CREATE_ONLY; import static org.eclipse.persistence.config.PersistenceUnitProperties.CREATE_OR_EXTEND; @@ -148,6 +148,7 @@ public class ControllerModule extends AbstractModule { bind(AbstractRootServiceResponseFactory.class).to(RootServiceResponseFactory.class); bind(ServerActionManager.class).to(ServerActionManagerImpl.class); bind(ExecutionScheduler.class).to(ExecutionSchedulerImpl.class); + bind(DBAccessor.class).to(DBAccessorImpl.class); requestStaticInjection(ExecutionCommandWrapper.class); }
