You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ey...@apache.org on 2011/10/26 20:22:05 UTC
svn commit: r1189359 - in /incubator/ambari/trunk: ./
client/src/main/java/org/apache/ambari/common/rest/agent/
client/src/main/java/org/apache/ambari/common/rest/entities/agent/
controller/src/main/java/org/apache/ambari/components/ controller/src/mai...
Author: eyang
Date: Wed Oct 26 18:22:04 2011
New Revision: 1189359
URL: http://svn.apache.org/viewvc?rev=1189359&view=rev
Log:
AMBARI-103. Refactor agent entities package to
org.apache.ambari.common.rest.agent. (Eric Yang)
Added:
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/
- copied from r1189342, incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/agent/
Removed:
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/agent/
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/Action.java
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ActionResult.java
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ActionResults.java
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/Actions.java
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/AgentRoleState.java
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/Command.java
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/CommandResult.java
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ConfigFile.java
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ControllerResponse.java
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/HardwareProfile.java
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/HeartBeat.java
incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/components/ComponentPlugin.java
incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/components/impl/XmlComponentDefinition.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/agent/AgentJAXBContextResolver.java
incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/agent/ControllerResource.java
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1189359&r1=1189358&r2=1189359&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Oct 26 18:22:04 2011
@@ -2,6 +2,9 @@ Ambari Change log
Release 0.1.0 - unreleased
+ AMBARI-103. Refactor agent entities package to
+ org.apache.ambari.common.rest.agent. (Eric Yang)
+
AMBARI-102. Reduce heartbeat message content, when installedRoleState
is empty. (Eric Yang)
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/Action.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/Action.java?rev=1189359&r1=1189342&r2=1189359&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/Action.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/Action.java Wed Oct 26 18:22:04 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.ambari.common.rest.entities.agent;
+package org.apache.ambari.common.rest.agent;
import java.util.concurrent.atomic.AtomicLong;
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ActionResult.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ActionResult.java?rev=1189359&r1=1189342&r2=1189359&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ActionResult.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ActionResult.java Wed Oct 26 18:22:04 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.ambari.common.rest.entities.agent;
+package org.apache.ambari.common.rest.agent;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,7 +24,7 @@ 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.agent.Action.Kind;
+import org.apache.ambari.common.rest.agent.Action.Kind;
/**
*
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ActionResults.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ActionResults.java?rev=1189359&r1=1189342&r2=1189359&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ActionResults.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ActionResults.java Wed Oct 26 18:22:04 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.ambari.common.rest.entities.agent;
+package org.apache.ambari.common.rest.agent;
import java.util.ArrayList;
import java.util.List;
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/Actions.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/Actions.java?rev=1189359&r1=1189342&r2=1189359&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/Actions.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/Actions.java Wed Oct 26 18:22:04 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.ambari.common.rest.entities.agent;
+package org.apache.ambari.common.rest.agent;
import java.util.ArrayList;
import java.util.List;
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/AgentRoleState.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/AgentRoleState.java?rev=1189359&r1=1189342&r2=1189359&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/AgentRoleState.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/AgentRoleState.java Wed Oct 26 18:22:04 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.ambari.common.rest.entities.agent;
+package org.apache.ambari.common.rest.agent;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/Command.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/Command.java?rev=1189359&r1=1189342&r2=1189359&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/Command.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/Command.java Wed Oct 26 18:22:04 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.ambari.common.rest.entities.agent;
+package org.apache.ambari.common.rest.agent;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/CommandResult.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/CommandResult.java?rev=1189359&r1=1189342&r2=1189359&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/CommandResult.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/CommandResult.java Wed Oct 26 18:22:04 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.ambari.common.rest.entities.agent;
+package org.apache.ambari.common.rest.agent;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ConfigFile.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ConfigFile.java?rev=1189359&r1=1189342&r2=1189359&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ConfigFile.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ConfigFile.java Wed Oct 26 18:22:04 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.ambari.common.rest.entities.agent;
+package org.apache.ambari.common.rest.agent;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ControllerResponse.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ControllerResponse.java?rev=1189359&r1=1189342&r2=1189359&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ControllerResponse.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/ControllerResponse.java Wed Oct 26 18:22:04 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.ambari.common.rest.entities.agent;
+package org.apache.ambari.common.rest.agent;
import java.util.List;
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/HardwareProfile.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/HardwareProfile.java?rev=1189359&r1=1189342&r2=1189359&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/HardwareProfile.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/HardwareProfile.java Wed Oct 26 18:22:04 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.ambari.common.rest.entities.agent;
+package org.apache.ambari.common.rest.agent;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/HeartBeat.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/HeartBeat.java?rev=1189359&r1=1189342&r2=1189359&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/HeartBeat.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/HeartBeat.java Wed Oct 26 18:22:04 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.ambari.common.rest.entities.agent;
+package org.apache.ambari.common.rest.agent;
import java.util.List;
Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/components/ComponentPlugin.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/components/ComponentPlugin.java?rev=1189359&r1=1189358&r2=1189359&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/components/ComponentPlugin.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/components/ComponentPlugin.java Wed Oct 26 18:22:04 2011
@@ -19,7 +19,7 @@ package org.apache.ambari.components;
import java.io.IOException;
-import org.apache.ambari.common.rest.entities.agent.Action;
+import org.apache.ambari.common.rest.agent.Action;
/**
* An interface for pluggable component definitions.
Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/components/impl/XmlComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/components/impl/XmlComponentDefinition.java?rev=1189359&r1=1189358&r2=1189359&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/components/impl/XmlComponentDefinition.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/components/impl/XmlComponentDefinition.java Wed Oct 26 18:22:04 2011
@@ -16,8 +16,8 @@ import javax.xml.bind.annotation.XmlType
import javax.xml.bind.annotation.XmlValue;
import org.apache.ambari.common.rest.entities.ComponentDefinition;
-import org.apache.ambari.common.rest.entities.agent.Action;
-import org.apache.ambari.common.rest.entities.agent.Command;
+import org.apache.ambari.common.rest.agent.Action;
+import org.apache.ambari.common.rest.agent.Command;
import org.apache.ambari.components.ComponentPlugin;
public class XmlComponentDefinition extends ComponentPlugin {
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=1189359&r1=1189358&r2=1189359&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 Wed Oct 26 18:22:04 2011
@@ -30,13 +30,13 @@ import java.util.concurrent.ConcurrentHa
import org.apache.ambari.controller.Clusters;
import org.apache.ambari.controller.Nodes;
-import org.apache.ambari.common.rest.entities.agent.Action;
-import org.apache.ambari.common.rest.entities.agent.Action.Kind;
-import org.apache.ambari.common.rest.entities.agent.ActionResult;
-import org.apache.ambari.common.rest.entities.agent.AgentRoleState;
-import org.apache.ambari.common.rest.entities.agent.ControllerResponse;
-import org.apache.ambari.common.rest.entities.agent.HeartBeat;
-import org.apache.ambari.common.rest.entities.agent.Action.Signal;
+import org.apache.ambari.common.rest.agent.Action;
+import org.apache.ambari.common.rest.agent.Action.Kind;
+import org.apache.ambari.common.rest.agent.ActionResult;
+import org.apache.ambari.common.rest.agent.AgentRoleState;
+import org.apache.ambari.common.rest.agent.ControllerResponse;
+import org.apache.ambari.common.rest.agent.HeartBeat;
+import org.apache.ambari.common.rest.agent.Action.Signal;
import org.apache.ambari.components.ComponentPlugin;
import org.apache.ambari.resource.statemachine.ClusterFSM;
import org.apache.ambari.resource.statemachine.RoleFSM;
Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/agent/AgentJAXBContextResolver.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/agent/AgentJAXBContextResolver.java?rev=1189359&r1=1189358&r2=1189359&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/agent/AgentJAXBContextResolver.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/agent/AgentJAXBContextResolver.java Wed Oct 26 18:22:04 2011
@@ -28,11 +28,11 @@ import javax.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.Provider;
import javax.xml.bind.JAXBContext;
import com.sun.jersey.api.json.JSONJAXBContext;
-import org.apache.ambari.common.rest.entities.agent.Command;
-import org.apache.ambari.common.rest.entities.agent.HeartBeat;
-import org.apache.ambari.common.rest.entities.agent.ControllerResponse;
-import org.apache.ambari.common.rest.entities.agent.Action;
-import org.apache.ambari.common.rest.entities.agent.ActionResult;
+import org.apache.ambari.common.rest.agent.Command;
+import org.apache.ambari.common.rest.agent.HeartBeat;
+import org.apache.ambari.common.rest.agent.ControllerResponse;
+import org.apache.ambari.common.rest.agent.Action;
+import org.apache.ambari.common.rest.agent.ActionResult;
@Provider
public class AgentJAXBContextResolver implements ContextResolver<JAXBContext> {
Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/agent/ControllerResource.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/agent/ControllerResource.java?rev=1189359&r1=1189358&r2=1189359&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/agent/ControllerResource.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/agent/ControllerResource.java Wed Oct 26 18:22:04 2011
@@ -33,17 +33,17 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
-import org.apache.ambari.common.rest.entities.agent.Action;
-import org.apache.ambari.common.rest.entities.agent.Action.Kind;
-import org.apache.ambari.common.rest.entities.agent.Action.Signal;
-import org.apache.ambari.common.rest.entities.agent.ActionResult;
-import org.apache.ambari.common.rest.entities.agent.AgentRoleState;
-import org.apache.ambari.common.rest.entities.agent.Command;
-import org.apache.ambari.common.rest.entities.agent.CommandResult;
-import org.apache.ambari.common.rest.entities.agent.ControllerResponse;
-import org.apache.ambari.common.rest.entities.agent.ConfigFile;
-import org.apache.ambari.common.rest.entities.agent.HardwareProfile;
-import org.apache.ambari.common.rest.entities.agent.HeartBeat;
+import org.apache.ambari.common.rest.agent.Action;
+import org.apache.ambari.common.rest.agent.Action.Kind;
+import org.apache.ambari.common.rest.agent.Action.Signal;
+import org.apache.ambari.common.rest.agent.ActionResult;
+import org.apache.ambari.common.rest.agent.AgentRoleState;
+import org.apache.ambari.common.rest.agent.Command;
+import org.apache.ambari.common.rest.agent.CommandResult;
+import org.apache.ambari.common.rest.agent.ControllerResponse;
+import org.apache.ambari.common.rest.agent.ConfigFile;
+import org.apache.ambari.common.rest.agent.HardwareProfile;
+import org.apache.ambari.common.rest.agent.HeartBeat;
import org.apache.ambari.common.util.ExceptionUtil;
import org.apache.ambari.controller.HeartbeatHandler;
import org.apache.commons.logging.Log;