Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 92FFCD3FA for ; Tue, 9 Oct 2012 22:40:42 +0000 (UTC) Received: (qmail 89914 invoked by uid 500); 9 Oct 2012 22:40:42 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 89876 invoked by uid 500); 9 Oct 2012 22:40:42 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 89865 invoked by uid 99); 9 Oct 2012 22:40:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Oct 2012 22:40:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Oct 2012 22:40:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C213923888E3; Tue, 9 Oct 2012 22:39:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1396389 - in /incubator/ambari/branches/AMBARI-666: ./ ambari-server/src/main/java/org/apache/ambari/server/controller/ ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ Date: Tue, 09 Oct 2012 22:39:54 -0000 To: ambari-commits@incubator.apache.org From: hitesh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121009223954.C213923888E3@eris.apache.org> Author: hitesh Date: Tue Oct 9 22:39:54 2012 New Revision: 1396389 URL: http://svn.apache.org/viewvc?rev=1396389&view=rev Log: AMBARI-837. Fix basic injection issues for controller impl. (Contributed by hitesh) Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt?rev=1396389&r1=1396388&r2=1396389&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original) +++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Tue Oct 9 22:39:54 2012 @@ -227,6 +227,8 @@ AMBARI-666 branch (unreleased changes) BUG FIXES + AMBARI-837. Fix basic injection issues for controller impl. (hitesh) + AMBARI-836. Fix generation of requestId to be unique across restarts. (hitesh) AMBARI-834. Use RoleCommand instead of ServiceComponentHostEventType for HostAction Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java?rev=1396389&r1=1396388&r2=1396389&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java (original) +++ incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java Tue Oct 9 22:39:54 2012 @@ -42,7 +42,7 @@ import org.apache.ambari.server.state.sv import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.inject.assistedinject.Assisted; +import com.google.inject.Inject; import java.util.ArrayList; import java.util.HashMap; @@ -64,10 +64,12 @@ public class AmbariManagementControllerI private final ActionManager actionManager; - public AmbariManagementControllerImpl(@Assisted ActionManager actionManager - , @Assisted Clusters clusters) { + @Inject + public AmbariManagementControllerImpl(ActionManager actionManager, + Clusters clusters) { this.clusters = clusters; this.actionManager = actionManager; + LOG.info("Initializing the AmbariManagementControllerImpl"); } @Override Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java?rev=1396389&r1=1396388&r2=1396389&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java (original) +++ incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java Tue Oct 9 22:39:54 2012 @@ -27,6 +27,7 @@ import org.apache.ambari.server.actionma import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.security.CertificateManager; +import org.apache.ambari.server.state.Clusters; import org.mortbay.jetty.Server; import org.mortbay.jetty.security.SslSocketConnector; import org.mortbay.jetty.servlet.Context; @@ -193,9 +194,15 @@ public class AmbariServer { serverForAgent.start(); //Start action scheduler + LOG.info("********* Initializing Clusters **********"); + Clusters clusters = injector.getInstance(Clusters.class); LOG.info("********* Started Server **********"); ActionManager manager = injector.getInstance(ActionManager.class); manager.start(); + LOG.info("********* Initializing Controller **********"); + AmbariManagementController controller = injector.getInstance( + AmbariManagementController.class); + server.join(); LOG.info("Joined the Server"); } catch (Exception e) { Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java?rev=1396389&r1=1396388&r2=1396389&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java (original) +++ incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java Tue Oct 9 22:39:54 2012 @@ -47,5 +47,7 @@ public class ControllerModule extends Ab bind(ActionDBAccessor.class).to(ActionDBInMemoryImpl.class); bindConstant().annotatedWith(Names.named("schedulerSleeptime")).to(10000L); bindConstant().annotatedWith(Names.named("actionTimeout")).to(60000L); + bind(AmbariManagementController.class) + .to(AmbariManagementControllerImpl.class); } } Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java?rev=1396389&r1=1396388&r2=1396389&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java (original) +++ incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java Tue Oct 9 22:39:54 2012 @@ -54,7 +54,7 @@ public class ClustersImpl implements Clu clustersById = new HashMap(); hosts = new HashMap(); hostClusterMap = new HashMap>(); - + LOG.info("Initializing the ClustersImpl"); } @Override