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 06CD87F38 for ; Sat, 8 Oct 2011 21:38:37 +0000 (UTC) Received: (qmail 60450 invoked by uid 500); 8 Oct 2011 21:38:37 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 60436 invoked by uid 500); 8 Oct 2011 21:38:37 -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 60427 invoked by uid 99); 8 Oct 2011 21:38:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Oct 2011 21:38:36 +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; Sat, 08 Oct 2011 21:38:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5E1E72388900; Sat, 8 Oct 2011 21:38:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1180497 - in /incubator/ambari/trunk: ./ client/src/main/java/org/apache/ambari/common/rest/entities/ controller/src/main/java/org/apache/ambari/components/impl/ controller/src/main/java/org/apache/ambari/controller/ controller/src/main/ja... Date: Sat, 08 Oct 2011 21:38:14 -0000 To: ambari-commits@incubator.apache.org From: vgogate@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111008213815.5E1E72388900@eris.apache.org> Author: vgogate Date: Sat Oct 8 21:38:14 2011 New Revision: 1180497 URL: http://svn.apache.org/viewvc?rev=1180497&view=rev Log: AMBARI-48 Added: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Cluster.java - copied, changed from r1180495, incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Cluster.java Removed: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Cluster.java Modified: incubator/ambari/trunk/CHANGES.txt incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/components/impl/ClusterContextImpl.java incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Blueprints.java incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/HeartbeatHandler.java incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/resources/ClusterResource.java incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/resource/statemachine/ClusterImpl.java incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/resource/statemachine/StateMachineInvoker.java Modified: incubator/ambari/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1180497&r1=1180496&r2=1180497&view=diff ============================================================================== --- incubator/ambari/trunk/CHANGES.txt (original) +++ incubator/ambari/trunk/CHANGES.txt Sat Oct 8 21:38:14 2011 @@ -2,6 +2,8 @@ Ambari Change log Release 0.1.0 - unreleased + AMBARI-48. Move Cluster object from rest entities to controller(vgogate) + AMBARI-47. Implement Cluster definition re-visioning(vgogate) AMBARI-45. Implement CLI command Cluster create (vgogate) Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/components/impl/ClusterContextImpl.java URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/components/impl/ClusterContextImpl.java?rev=1180497&r1=1180496&r2=1180497&view=diff ============================================================================== --- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/components/impl/ClusterContextImpl.java (original) +++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/components/impl/ClusterContextImpl.java Sat Oct 8 21:38:14 2011 @@ -18,10 +18,10 @@ package org.apache.ambari.components.impl; import org.apache.ambari.common.rest.entities.Blueprint; -import org.apache.ambari.common.rest.entities.Cluster; import org.apache.ambari.common.rest.entities.ClusterDefinition; import org.apache.ambari.common.rest.entities.Node; import org.apache.ambari.components.ClusterContext; +import org.apache.ambari.controller.Cluster; public class ClusterContextImpl implements ClusterContext { Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Blueprints.java URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Blueprints.java?rev=1180497&r1=1180496&r2=1180497&view=diff ============================================================================== --- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Blueprints.java (original) +++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Blueprints.java Sat Oct 8 21:38:14 2011 @@ -35,7 +35,6 @@ import javax.ws.rs.WebApplicationExcepti import javax.ws.rs.core.Response; import org.apache.ambari.common.rest.entities.Blueprint; -import org.apache.ambari.common.rest.entities.Cluster; import org.apache.ambari.common.rest.entities.Component; import org.apache.ambari.common.rest.entities.Configuration; import org.apache.ambari.common.rest.entities.ConfigurationCategory; Copied: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Cluster.java (from r1180495, incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Cluster.java) URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Cluster.java?p2=incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Cluster.java&p1=incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Cluster.java&r1=1180495&r2=1180497&rev=1180497&view=diff ============================================================================== --- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Cluster.java (original) +++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Cluster.java Sat Oct 8 21:38:14 2011 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.ambari.common.rest.entities; +package org.apache.ambari.controller; import java.util.List; import java.util.concurrent.ConcurrentHashMap; @@ -26,6 +26,9 @@ import javax.xml.bind.annotation.XmlElem import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.apache.ambari.common.rest.entities.ClusterDefinition; +import org.apache.ambari.common.rest.entities.ClusterState; + public class Cluster { Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java?rev=1180497&r1=1180496&r2=1180497&view=diff ============================================================================== --- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java (original) +++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java Sat Oct 8 21:38:14 2011 @@ -30,7 +30,6 @@ import java.util.concurrent.ConcurrentHa import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; -import org.apache.ambari.common.rest.entities.Cluster; import org.apache.ambari.common.rest.entities.ClusterDefinition; import org.apache.ambari.common.rest.entities.ClusterState; import org.apache.ambari.common.rest.entities.Node; Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/HeartbeatHandler.java URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/HeartbeatHandler.java?rev=1180497&r1=1180496&r2=1180497&view=diff ============================================================================== --- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/HeartbeatHandler.java (original) +++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/HeartbeatHandler.java Sat Oct 8 21:38:14 2011 @@ -29,7 +29,6 @@ import java.util.Map; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; -import org.apache.ambari.common.rest.entities.Cluster; import org.apache.ambari.common.rest.entities.Node; import org.apache.ambari.common.rest.entities.NodeState; import org.apache.ambari.controller.Clusters; Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/resources/ClusterResource.java URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/resources/ClusterResource.java?rev=1180497&r1=1180496&r2=1180497&view=diff ============================================================================== --- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/resources/ClusterResource.java (original) +++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/resources/ClusterResource.java Sat Oct 8 21:38:14 2011 @@ -35,10 +35,10 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; -import org.apache.ambari.common.rest.entities.Cluster; import org.apache.ambari.common.rest.entities.ClusterDefinition; import org.apache.ambari.common.rest.entities.Node; import org.apache.ambari.common.rest.entities.ClusterState; +import org.apache.ambari.controller.Cluster; import org.apache.ambari.controller.Clusters; import org.apache.ambari.controller.ExceptionResponse; import org.apache.ambari.controller.Nodes; Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/resource/statemachine/ClusterImpl.java URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/resource/statemachine/ClusterImpl.java?rev=1180497&r1=1180496&r2=1180497&view=diff ============================================================================== --- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/resource/statemachine/ClusterImpl.java (original) +++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/resource/statemachine/ClusterImpl.java Sat Oct 8 21:38:14 2011 @@ -28,12 +28,12 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.ambari.common.rest.entities.Cluster; import org.apache.ambari.common.rest.entities.ClusterState; import org.apache.ambari.common.state.MultipleArcTransition; import org.apache.ambari.common.state.SingleArcTransition; import org.apache.ambari.common.state.StateMachine; import org.apache.ambari.common.state.StateMachineFactory; +import org.apache.ambari.controller.Cluster; import org.apache.ambari.event.EventHandler; public class ClusterImpl implements ClusterFSM, EventHandler { Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/resource/statemachine/StateMachineInvoker.java URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/resource/statemachine/StateMachineInvoker.java?rev=1180497&r1=1180496&r2=1180497&view=diff ============================================================================== --- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/resource/statemachine/StateMachineInvoker.java (original) +++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/resource/statemachine/StateMachineInvoker.java Sat Oct 8 21:38:14 2011 @@ -21,8 +21,8 @@ import java.io.IOException; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.ambari.common.rest.entities.Cluster; import org.apache.ambari.common.rest.entities.ClusterState; +import org.apache.ambari.controller.Cluster; import org.apache.ambari.event.AsyncDispatcher; import org.apache.ambari.event.Dispatcher; import org.apache.ambari.event.EventHandler;