You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by om...@apache.org on 2011/12/17 01:15:18 UTC
svn commit: r1215359 - in /incubator/ambari/trunk: ./
controller/src/main/java/org/apache/ambari/components/
controller/src/main/java/org/apache/ambari/components/impl/
controller/src/main/resources/org/apache/ambari/stacks/
Author: omalley
Date: Sat Dec 17 00:15:18 2011
New Revision: 1215359
URL: http://svn.apache.org/viewvc?rev=1215359&view=rev
Log:
AMBARI-165. Fix the component definition for HDFS. (omalley)
Modified:
incubator/ambari/trunk/CHANGES.txt
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/resources/org/apache/ambari/stacks/hadoop-security-0.xml
incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.json
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1215359&r1=1215358&r2=1215359&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Sat Dec 17 00:15:18 2011
@@ -2,14 +2,18 @@ Ambari Change log
Release 0.1.0 - unreleased
- AMBARI-162. Fixed agent unit test failure when ethernet is not in used. (Eric Yang)
+ AMBARI-165. Fix the component definition for HDFS. (omalley)
+
+ AMBARI-162. Fixed agent unit test failure when ethernet is not in
+ used. (Eric Yang)
AMBARI-161. Add puppet module for Hadoop to agent resources (vgogate)
AMBARI-159. Temporarily disabled security (until Ambari upgrades to
Python2.7). (ddas)
- AMBARI-160. Ambari client add stack command should allow both json and xml (vgogate)
+ AMBARI-160. Ambari client add stack command should allow both json
+ and xml (vgogate)
AMBARI-158. Move the JSON encoding to the natural one. (omalley)
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=1215359&r1=1215358&r2=1215359&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 Sat Dec 17 00:15:18 2011
@@ -26,7 +26,11 @@ import org.apache.ambari.common.rest.age
*/
public abstract class ComponentPlugin {
- public abstract String getProvides();
+ /**
+ * Get the name of the component.
+ * @return the name
+ */
+ public abstract String getName();
/**
* Get the active roles (ie. with servers) for this component.
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=1215359&r1=1215358&r2=1215359&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 Sat Dec 17 00:15:18 2011
@@ -49,7 +49,7 @@ class XmlComponentDefinition extends Com
})
@XmlRootElement
public static class Component {
- @XmlAttribute String provides;
+ @XmlAttribute String name;
@XmlElement List<Requires> requires;
@XmlElement List<Role> roles;
@XmlElement Start start;
@@ -70,21 +70,10 @@ class XmlComponentDefinition extends Com
}
public static class ScriptCommand {
- @XmlAttribute String user;
@XmlValue String script;
}
@XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "install")
- public static class Install extends ScriptCommand {
- }
-
- @XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "configure")
- public static class Configure extends ScriptCommand {
- }
-
- @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "start")
public static class Start extends ScriptCommand {
}
@@ -101,11 +90,6 @@ class XmlComponentDefinition extends Com
@XmlAttribute String runOn;
}
- @XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "uninstall")
- public static class Uninstall extends ScriptCommand {
- }
-
private static final JAXBContext jaxbContext;
static {
try {
@@ -115,7 +99,7 @@ class XmlComponentDefinition extends Com
}
}
- private final String provides;
+ private final String name;
private final String[] roles;
private final String[] dependencies;
private final String startCommand;
@@ -128,8 +112,8 @@ class XmlComponentDefinition extends Com
private final String checkUser = "agent";
@Override
- public String getProvides() {
- return provides;
+ public String getName() {
+ return name;
}
@Override
@@ -204,7 +188,7 @@ class XmlComponentDefinition extends Com
try {
um = jaxbContext.createUnmarshaller();
Component component = (Component) um.unmarshal(in);
- provides = component.provides;
+ name = component.name;
int i = 0;
if (component.requires == null) {
dependencies = new String[0];
@@ -267,9 +251,9 @@ class XmlComponentDefinition extends Com
defn.setProvider("org.apache.ambari");
defn.setVersion("0.1.0");
XmlComponentDefinition comp = new XmlComponentDefinition(defn);
- System.out.println(comp.provides);
+ System.out.println(comp.name);
defn.setName("hadoop-common");
comp = new XmlComponentDefinition(defn);
- System.out.println(comp.provides);
+ System.out.println(comp.name);
}
}
Modified: incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/hadoop-security-0.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/hadoop-security-0.xml?rev=1215359&r1=1215358&r2=1215359&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/hadoop-security-0.xml (original)
+++ incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/hadoop-security-0.xml Sat Dec 17 00:15:18 2011
@@ -72,7 +72,7 @@
</components>
<components architecture="x86_64" name="hdfs"
provider="org.apache.hadoop" version="0.20.205.0">
- <definition name="hadoop-hdfs" version="0.1.0"
+ <definition name="hdfs" version="0.1.0"
provider="org.apache.ambari"/>
<configuration>
<category name="hadoop-env">
Modified: incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.json
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.json?rev=1215359&r1=1215358&r2=1215359&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.json (original)
+++ incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.json Sat Dec 17 00:15:18 2011
@@ -193,7 +193,7 @@
"@provider":"org.apache.hadoop",
"definition":{
"@provider":"org.apache.ambari",
- "@name":"hadoop-hdfs",
+ "@name":"hdfs",
"@version":"0.1.0"
},
"configuration":{