AMBARI-752. Add missing license header to TestServiceComponentHostState. (Contributed by hitesh)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/AMBARI-666@1387322 13f79535-47bb-0310-9956-ffa450edef68

AMBARI-666-CHANGES.txt

@@ -134,6 +134,8 @@ AMBARI-666 branch (unreleased changes)
 
   BUG FIXES
 
+  AMBARI-753. Fix broken compile as a result of re-factor of FSM layout. (hitesh)
+
   AMBARI-752. Add missing license header to TestServiceComponentHostState. (hitesh)
 
   AMBARI-750. Fix build compilation issue. (mahadev)

ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java

@@ -27,8 +27,8 @@ import org.apache.ambari.server.agent.ActionQueue;
 import org.apache.ambari.server.agent.ExecutionCommand;
 import org.apache.ambari.server.state.fsm.InvalidStateTransitonException;
 import org.apache.ambari.server.state.live.Clusters;
-import org.apache.ambari.server.state.live.ServiceComponentHostEvent;
-import org.apache.ambari.server.state.live.ServiceComponentHostEventType;
+import org.apache.ambari.server.state.live.svccomphost.ServiceComponentHostEvent;
+import org.apache.ambari.server.state.live.svccomphost.ServiceComponentHostEventType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java

@@ -21,7 +21,7 @@ import java.util.Map;
 
 import org.apache.ambari.server.Role;
 import org.apache.ambari.server.RoleCommand;
-import org.apache.ambari.server.state.live.ServiceComponentHostEvent;
+import org.apache.ambari.server.state.live.svccomphost.ServiceComponentHostEvent;
 
 /**
  * This class encapsulates all the information for an action

ambari-server/src/main/java/org/apache/ambari/server/state/ConfigVersion.java

@@ -50,7 +50,7 @@ public class ConfigVersion {
       return true;
     }
     ConfigVersion c = (ConfigVersion) object;
-    return c.equals(this.configVersion);
+    return configVersion.equals(c.configVersion);
   }
 
   @Override

ambari-server/src/main/java/org/apache/ambari/server/state/StackVersion.java

@@ -49,7 +49,7 @@ public class StackVersion {
       return true;
     }
     StackVersion s = (StackVersion) object;
-    return s.equals(this.stackVersion);
+    return stackVersion.equals(s.stackVersion);
   }
 
   @Override