You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vg...@apache.org on 2011/09/23 03:21:11 UTC
svn commit: r1174478 - in /incubator/ambari/trunk: ./
client/src/main/java/org/apache/ambari/common/rest/entities/
controller/src/main/java/org/apache/ambari/controller/
controller/src/main/java/org/apache/ambari/controller/rest/resources/
Author: vgogate
Date: Fri Sep 23 01:21:10 2011
New Revision: 1174478
URL: http://svn.apache.org/viewvc?rev=1174478&view=rev
Log:
AMBARI-6
Added:
incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java
- copied, changed from r1174451, incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Clusters.java
incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Nodes.java
- copied, changed from r1174451, incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Nodes.java
Removed:
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Clusters.java
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Nodes.java
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/ClusterState.java
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Node.java
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/ObjectFactory.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/controller/rest/resources/ClustersResource.java
incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/resources/StacksResource.java
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1174478&r1=1174477&r2=1174478&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Sep 23 01:21:10 2011
@@ -2,6 +2,8 @@ Ambari Change log
Release 0.1.0 - unreleased
+ AMBARI-6. Moving Clusters and Nodes container objects into controller
+
AMBARI-5. Added some left over changes from git repository for Ambari REST APIs
AMBARI-4. Created interface for component plugins. (omalley)
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/ClusterState.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/ClusterState.java?rev=1174478&r1=1174477&r2=1174478&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/ClusterState.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/ClusterState.java Fri Sep 23 01:21:10 2011
@@ -79,7 +79,7 @@ public class ClusterState {
/**
* @param creationTime the creationTime to set
*/
- protected void setCreationTime(Date creationTime) throws Exception {
+ public void setCreationTime(Date creationTime) throws Exception {
GregorianCalendar cal = new GregorianCalendar();
cal.setTime(creationTime);
this.creationTime = DatatypeFactory.newInstance().newXMLGregorianCalendar(cal);
@@ -102,7 +102,7 @@ public class ClusterState {
/**
* @param creationTime the creationTime to set
*/
- protected void setDeployTime(Date deployTime) throws Exception {
+ public void setDeployTime(Date deployTime) throws Exception {
GregorianCalendar cal = new GregorianCalendar();
cal.setTime(deployTime);
this.deployTime = DatatypeFactory.newInstance().newXMLGregorianCalendar(cal);
@@ -125,7 +125,7 @@ public class ClusterState {
/**
* @param creationTime the creationTime to set
*/
- protected void setLastUpdateTime(Date lastUpdateTime) throws Exception {
+ public void setLastUpdateTime(Date lastUpdateTime) throws Exception {
GregorianCalendar cal = new GregorianCalendar();
cal.setTime(lastUpdateTime);
this.lastUpdateTime = DatatypeFactory.newInstance().newXMLGregorianCalendar(cal);
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Node.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Node.java?rev=1174478&r1=1174477&r2=1174478&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Node.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Node.java Fri Sep 23 01:21:10 2011
@@ -61,18 +61,7 @@ public class Node {
this.getNodeState().setAgentInstalled(agentInstalled);
}
- /*
- *
- */
- public List<String> getAssociatedRoleNames() throws Exception {
- List<String> list = new ArrayList<String>();
- if (this.getNodeState().getClusterName() != null) {
- for (RoleToNodesMapEntry rnme : Clusters.getInstance().getCluster(this.getNodeState().getClusterName()).getRoleToNodesMap().getRoleToNodesMapEntry()) {
- list.add(rnme.getRoleName());
- }
- }
- return list;
- }
+
/**
* @return the name
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/ObjectFactory.java?rev=1174478&r1=1174477&r2=1174478&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/ObjectFactory.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/ObjectFactory.java Fri Sep 23 01:21:10 2011
@@ -82,14 +82,6 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link Nodes }
- *
- */
- public Nodes createNodesType() {
- return Nodes.getInstance();
- }
-
- /**
* Create an instance of {@link RoleToNodesMapEntry }
*
*/
@@ -130,14 +122,6 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link Clusters }
- *
- */
- public Clusters createClustersType() {
- return Clusters.getInstance();
- }
-
- /**
* Create an instance of {@link Services }
*
*/
@@ -193,22 +177,4 @@ public class ObjectFactory {
return new DiagnosticLog();
}
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link Clusters }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "", name = "Clusters")
- public JAXBElement<Clusters> createClusters(Clusters value) {
- return new JAXBElement<Clusters>(_Clusters_QNAME, Clusters.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link Nodes }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "", name = "Nodes")
- public JAXBElement<Nodes> createNodes(Nodes value) {
- return new JAXBElement<Nodes>(_Nodes_QNAME, Nodes.class, null, value);
- }
-
}
Copied: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java (from r1174451, incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Clusters.java)
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java?p2=incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java&p1=incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Clusters.java&r1=1174451&r2=1174478&rev=1174478&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Clusters.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java Fri Sep 23 01:21:10 2011
@@ -6,7 +6,7 @@
//
-package org.apache.ambari.common.rest.entities;
+package org.apache.ambari.controller;
import java.util.ArrayList;
import java.util.Collection;
@@ -33,6 +33,13 @@ import javax.xml.bind.annotation.adapter
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
+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;
+import org.apache.ambari.common.rest.entities.RoleToNodesMap;
+import org.apache.ambari.common.rest.entities.RoleToNodesMapEntry;
+
public class Clusters {
/*
@@ -494,4 +501,20 @@ public class Clusters {
}
}
}
+
+ /*
+ * Util methods on entities
+ */
+ /*
+ *
+ */
+ public List<String> getAssociatedRoleNames(Node n) throws Exception {
+ List<String> list = new ArrayList<String>();
+ if (n.getNodeState().getClusterName() != null) {
+ for (RoleToNodesMapEntry rnme : Clusters.getInstance().getCluster(n.getNodeState().getClusterName()).getRoleToNodesMap().getRoleToNodesMapEntry()) {
+ list.add(rnme.getRoleName());
+ }
+ }
+ return list;
+ }
}
Copied: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Nodes.java (from r1174451, incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Nodes.java)
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Nodes.java?p2=incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Nodes.java&p1=incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Nodes.java&r1=1174451&r2=1174478&rev=1174478&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/Nodes.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Nodes.java Fri Sep 23 01:21:10 2011
@@ -6,7 +6,7 @@
//
-package org.apache.ambari.common.rest.entities;
+package org.apache.ambari.controller;
import java.util.ArrayList;
import java.util.HashMap;
@@ -24,6 +24,8 @@ 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.Node;
+
public class Nodes {
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=1174478&r1=1174477&r2=1174478&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 Fri Sep 23 01:21:10 2011
@@ -16,9 +16,9 @@ import javax.ws.rs.QueryParam;
import org.apache.ambari.common.rest.entities.Cluster;
-import org.apache.ambari.common.rest.entities.Clusters;
import org.apache.ambari.common.rest.entities.Node;
import org.apache.ambari.common.rest.entities.ClusterState;
+import org.apache.ambari.controller.Clusters;
/** ClusterResource represents a Hadoop Cluster in a data center.
*
Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/resources/ClustersResource.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/resources/ClustersResource.java?rev=1174478&r1=1174477&r2=1174478&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/resources/ClustersResource.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/resources/ClustersResource.java Fri Sep 23 01:21:10 2011
@@ -5,8 +5,8 @@ package org.apache.ambari.controller.res
import java.util.List;
-import org.apache.ambari.common.rest.entities.Clusters;
import org.apache.ambari.common.rest.entities.ClusterDefinition;
+import org.apache.ambari.controller.Clusters;
import com.sun.jersey.spi.resource.Singleton;
import javax.ws.rs.GET;
Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/resources/StacksResource.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/resources/StacksResource.java?rev=1174478&r1=1174477&r2=1174478&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/resources/StacksResource.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/resources/StacksResource.java Fri Sep 23 01:21:10 2011
@@ -16,9 +16,10 @@ import javax.xml.bind.annotation.XmlElem
import org.apache.ambari.common.rest.entities.Blueprint;
import org.apache.ambari.common.rest.entities.Cluster;
-import org.apache.ambari.common.rest.entities.Clusters;
import org.apache.ambari.common.rest.entities.Stack;
import org.apache.ambari.common.rest.entities.Stacks;
+import org.apache.ambari.controller.Clusters;
+
import com.sun.jersey.spi.resource.Singleton;
/** Stacks resource represents a collection of Hadoop Stacks