AMBARI-1178. Fix use of use ip address for JMX metrics request. (tbeerbower via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1435409 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -59,6 +59,9 @@ Trunk (unreleased changes):
  AMBARI-1184. After adding hosts, the host count shown in the Dashboard is
  incorrect. (yusaku)
 
+ AMBARI-1178. Fix use of use ip address for JMX metrics request. (tbeerbower
+ via mahadev)
+
 AMBARI-1.2.0 branch:
 
  INCOMPATIBLE CHANGES

ambari-agent/.project

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ambari-agent</name>
-	<comment>Apache Ambari Project POM. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.rubypeople.rdt.core.rubybuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.python.pydev.PyDevBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.python.pydev.pythonNature</nature>
-		<nature>org.rubypeople.rdt.core.rubynature</nature>
-	</natures>
-</projectDescription>

ambari-agent/.pydevproject

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
-</pydev_project>

ambari-agent/ambari-agent.iml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-

ambari-agent/pom.xml

@@ -150,6 +150,10 @@
             <scriptFile>src/main/package/rpm/preinstall.sh</scriptFile>
             <fileEncoding>utf-8</fileEncoding>
           </preinstallScriptlet>
+          <preremoveScriptlet>
+            <script>mv /etc/ambari-agent/conf /etc/ambari-agent/conf.save</script>
+          </preremoveScriptlet>
+
           <needarch>x86_64</needarch>
           <autoRequires>false</autoRequires>
           <mappings>

ambari-agent/src/main/puppet/modules/hdp-mysql/files/startMysql.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-
-mysqldbuser=$1
-mysqldbpasswd=$2
-mysqldbhost=$3
-
-echo "Adding user $mysqldbuser@$mysqldbhost and $mysqldbuser@localhost"
-mysql -u root -e "CREATE USER '$mysqldbuser'@'$mysqldbhost' IDENTIFIED BY '$mysqldbpasswd';"
-mysql -u root -e "CREATE USER '$mysqldbuser'@'localhost' IDENTIFIED BY '$mysqldbpasswd';"
-mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO '$mysqldbuser'@'$mysqldbhost';"
-mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO '$mysqldbuser'@'localhost';"
-mysql -u root -e "flush privileges;"

ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/service.pp

@@ -85,11 +85,10 @@ class hdp-zookeeper::service(
 
 class hdp-zookeeper::set_myid($myid)
 {
-  $create_file = "${hdp-zookeeper::params::zk_data_dir}/myid"
-  $cmd = "echo '${myid}' > ${create_file}"
-  hdp::exec{ $cmd:
-    command => $cmd,
-    creates  => $create_file
+  file {"${hdp-zookeeper::params::zk_data_dir}/myid":
+    ensure  => file,
+    content => $myid,
+    mode    => 0644,
   }
 }
 

ambari-project/ambari-project.iml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-

ambari-server/.classpath

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
-	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
-	<classpathentry kind="var" path="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.2.2/jaxb-api-2.2.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="var" path="M2_REPO/commons-io/commons-io/2.1/commons-io-2.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/google/inject/guice/3.0/guice-3.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-assistedinject/3.0/guice-assistedinject-3.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-persist/3.0/guice-persist-3.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.9.1.0/derby-10.9.1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/security/spring-security-core/3.1.2.RELEASE/spring-security-core-3.1.2.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.0.7.RELEASE/spring-aop-3.0.7.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-asm/3.0.7.RELEASE/spring-asm-3.0.7.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.0.7.RELEASE/spring-beans-3.0.7.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.0.7.RELEASE/spring-core-3.0.7.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.0.7.RELEASE/spring-context-3.0.7.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.0.7.RELEASE/spring-expression-3.0.7.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/security/spring-security-config/3.1.2.RELEASE/spring-security-config-3.1.2.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/security/spring-security-web/3.1.2.RELEASE/spring-security-web-3.1.2.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/3.0.7.RELEASE/spring-jdbc-3.0.7.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/3.0.7.RELEASE/spring-tx-3.0.7.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.0.7.RELEASE/spring-web-3.0.7.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/security/spring-security-ldap/3.1.2.RELEASE/spring-security-ldap-3.1.2.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/ldap/spring-ldap-core/1.3.1.RELEASE/spring-ldap-core-1.3.1.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-core/1.5.5/apacheds-core-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-xdbm-search/1.5.5/apacheds-xdbm-search-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-xdbm-base/1.5.5/apacheds-xdbm-base-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-schema-registries/1.5.5/apacheds-schema-registries-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-core-shared/1.5.5/apacheds-core-shared-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-core-constants/1.5.5/apacheds-core-constants-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/shared/shared-ldap/0.9.17/shared-ldap-0.9.17.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/shared/shared-asn1/0.9.17/shared-asn1-0.9.17.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/shared/shared-ldap-constants/0.9.17/shared-ldap-constants-0.9.17.jar"/>
-	<classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/shared/shared-cursor/0.9.15/shared-cursor-0.9.15.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-core-entry/1.5.5/apacheds-core-entry-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-jdbm/1.5.5/apacheds-jdbm-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-schema-extras/1.5.5/apacheds-schema-extras-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-schema-bootstrap/1.5.5/apacheds-schema-bootstrap-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-xdbm-tools/1.5.5/apacheds-xdbm-tools-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-utils/1.5.5/apacheds-utils-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-jdbm-store/1.5.5/apacheds-jdbm-store-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-core-avl/1.5.5/apacheds-core-avl-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-bootstrap-extract/1.5.5/apacheds-bootstrap-extract-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/bouncycastle/bcprov-jdk15/140/bcprov-jdk15-140.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-protocol-ldap/1.5.5/apacheds-protocol-ldap-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/shared/shared-asn1-codec/0.9.15/shared-asn1-codec-0.9.15.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-M6/mina-core-2.0.0-M6.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-kerberos-shared/1.5.5/apacheds-kerberos-shared-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-core-jndi/1.5.5/apacheds-core-jndi-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-protocol-shared/1.5.5/apacheds-protocol-shared-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/directory/server/apacheds-bootstrap-partition/1.5.5/apacheds-bootstrap-partition-1.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.7.2/slf4j-log4j12-1.7.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/persistence/eclipselink/2.4.0/eclipselink-2.4.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/persistence/javax.persistence/2.0.4.v201112161009/javax.persistence-2.0.4.v201112161009.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commonj/sdo/commonj.sdo/2.1.1.v201112051852/commonj.sdo-2.1.1.v201112051852.jar"/>
-	<classpathentry kind="var" path="M2_REPO/postgresql/postgresql/8.3-603.jdbc4/postgresql-8.3-603.jdbc4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-security/7.6.7.v20120910/jetty-security-7.6.7.v20120910.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-server/7.6.7.v20120910/jetty-server-7.6.7.v20120910.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/orbit/javax.servlet/2.5.0.v201103041518/javax.servlet-2.5.0.v201103041518.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-continuation/7.6.7.v20120910/jetty-continuation-7.6.7.v20120910.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-http/7.6.7.v20120910/jetty-http-7.6.7.v20120910.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-io/7.6.7.v20120910/jetty-io-7.6.7.v20120910.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-util/7.6.7.v20120910/jetty-util-7.6.7.v20120910.jar" sourcepath="/JETTY-7.6.7-SOURCE"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-servlet/7.6.7.v20120910/jetty-servlet-7.6.7.v20120910.jar" sourcepath="/JETTY-7.6.7-SOURCE"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-webapp/7.6.7.v20120910/jetty-webapp-7.6.7.v20120910.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-xml/7.6.7.v20120910/jetty-xml-7.6.7.v20120910.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-json/1.11/jersey-json-1.11.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.3-1/jaxb-impl-2.2.3-1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.9.9/jackson-core-asl-1.9.9.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-jaxrs/1.9.9/jackson-jaxrs-1.9.9.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-core/1.11/jersey-core-1.11.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-server/1.11/jersey-server-1.11.jar"/>
-	<classpathentry kind="var" path="M2_REPO/asm/asm/3.3.1/asm-3.3.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-client/1.11/jersey-client-1.11.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/sun/jersey/contribs/jersey-multipart/1.11/jersey-multipart-1.11.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jvnet/mimepull/1.6/mimepull-1.6.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/sun/jersey/contribs/jersey-guice/1.11/jersey-guice-1.11.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-servlet/1.11/jersey-servlet-1.11.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.9.2/jackson-mapper-asl-1.9.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-xc/1.9.9/jackson-xc-1.9.9.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-test-framework/jersey-test-framework-core/1.11/jersey-test-framework-core-1.11.jar"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/4.10/junit-4.10.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-test-framework/jersey-test-framework-grizzly2/1.11/jersey-test-framework-grizzly2-1.11.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-grizzly2-servlet/1.11/jersey-grizzly2-servlet-1.11.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/glassfish/grizzly/grizzly-http-servlet/2.1.2/grizzly-http-servlet-2.1.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/glassfish/grizzly/grizzly-framework/2.1.2/grizzly-framework-2.1.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/glassfish/gmbal/gmbal-api-only/3.0.0-b023/gmbal-api-only-3.0.0-b023.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/glassfish/external/management-api/3.0.0-b012/management-api-3.0.0-b012.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/glassfish/grizzly/grizzly-http-server/2.1.2/grizzly-http-server-2.1.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/glassfish/grizzly/grizzly-http/2.1.2/grizzly-http-2.1.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/glassfish/grizzly/grizzly-rcm/2.1.2/grizzly-rcm-2.1.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-grizzly2/1.11/jersey-grizzly2-1.11.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/glassfish/javax.servlet/3.1/javax.servlet-3.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.1/jettison-1.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/easymock/easymock/3.1/easymock-3.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.2.2/cglib-nodep-2.2.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis-tck/1.2/objenesis-tck-1.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/cglib/cglib/2.2.2/cglib-2.2.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/xerial/sqlite-jdbc/3.7.2/sqlite-jdbc-3.7.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/google/code/gson/gson/2.2.2/gson-2.2.2.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

ambari-server/.project

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-  <name>ambari-server</name>
-  <comment>Ambari Server. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.python.pydev.PyDevBuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.python.pydev.pythonNature</nature>
-  </natures>
-</projectDescription>

ambari-server/.pydevproject

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
-</pydev_project>

ambari-server/.settings/org.eclipse.jdt.core.prefs

@@ -1,277 +0,0 @@
-#Wed Nov 07 23:09:50 PST 2012
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.tabulation.size=2
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.lineSplit=80
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-eclipse.preferences.version=1
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.indentation.size=2
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

ambari-server/.settings/org.eclipse.jdt.ui.prefs

@@ -1,4 +0,0 @@
-#Sun Oct 21 00:06:40 PDT 2012
-eclipse.preferences.version=1
-formatter_profile=_hadoop
-formatter_settings_version=12

ambari-server/ambari-server.iml

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/test-annotations" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target/ambari-server-1.0.3-SNAPSHOT-dist" />
-      <excludeFolder url="file://$MODULE_DIR$/target/archive-tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/target/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
-      <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.inject:guice:3.0" level="project" />
-    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.inject.extensions:guice-assistedinject:3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.inject.extensions:guice-persist:3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.inject.extensions:guice-servlet:3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.derby:derby:10.9.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:3.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:3.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:3.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:3.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:3.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:3.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:3.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-ldap:3.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.ldap:spring-ldap-core:1.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-core:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-xdbm-search:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-xdbm-base:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-schema-registries:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-core-shared:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-core-constants:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.shared:shared-ldap:0.9.17" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.shared:shared-asn1:0.9.17" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.shared:shared-ldap-constants:0.9.17" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.shared:shared-cursor:0.9.15" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-core-entry:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-jdbm:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-schema-extras:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-schema-bootstrap:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-xdbm-tools:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-utils:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-jdbm-store:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-core-avl:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-bootstrap-extract:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk15:140" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-protocol-ldap:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.shared:shared-asn1-codec:0.9.15" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.mina:mina-core:2.0.0-M6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-kerberos-shared:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-core-jndi:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-protocol-shared:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-bootstrap-partition:1.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.2" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.persistence:eclipselink:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.persistence:javax.persistence:2.0.4.v201112161009" level="project" />
-    <orderEntry type="library" name="Maven: commonj.sdo:commonj.sdo:2.1.1.v201112051852" level="project" />
-    <orderEntry type="library" name="Maven: postgresql:postgresql:8.3-603.jdbc4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.8.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:7.6.7.v20120910" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:7.6.7.v20120910" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.orbit:javax.servlet:2.5.0.v201103041518" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-continuation:7.6.7.v20120910" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:7.6.7.v20120910" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:7.6.7.v20120910" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:7.6.7.v20120910" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:7.6.7.v20120910" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:7.6.7.v20120910" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:7.6.7.v20120910" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-json:1.11" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.3-1" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.9" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.9" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.11" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-server:1.11" level="project" />
-    <orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-client:1.11" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey.contribs:jersey-multipart:1.11" level="project" />
-    <orderEntry type="library" name="Maven: org.jvnet:mimepull:1.6" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey.contribs:jersey-guice:1.11" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-servlet:1.11" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-xc:1.9.9" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.sun.jersey.jersey-test-framework:jersey-test-framework-core:1.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.servlet:javax.servlet-api:3.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:1.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.sun.jersey:jersey-grizzly2-servlet:1.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.grizzly:grizzly-http-servlet:2.1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.grizzly:grizzly-framework:2.1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.gmbal:gmbal-api-only:3.0.0-b023" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.external:management-api:3.0.0-b012" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.grizzly:grizzly-http-server:2.1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.grizzly:grizzly-http:2.1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.grizzly:grizzly-rcm:2.1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.sun.jersey:jersey-grizzly2:1.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.glassfish:javax.servlet:3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.objenesis:objenesis-tck:1.2" level="project" />
-    <orderEntry type="library" name="Maven: cglib:cglib:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.7.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.2" level="project" />
-  </component>
-</module>
-

ambari-server/derby.log

@@ -1,10 +0,0 @@
-----------------------------------------------------------------
-Mon Jan 07 23:30:20 PST 2013:
-Booting Derby version The Apache Software Foundation - Apache Derby - 10.9.1.0 - (1344872): instance a816c00e-013c-1911-2686-000003d87098 
-on database directory memory:/Users/mahadev/workspace/ambari-workspace/ambari-git/ambari-server/myDB  with class loader sun.misc.Launcher$AppClassLoader@27a8c4e7 
-Loaded from file:/Users/mahadev/.m2/repository/org/apache/derby/derby/10.9.1.0/derby-10.9.1.0.jar
-java.vendor=Apple Inc.
-java.runtime.version=1.6.0_26-b03-384-10M3425
-user.dir=/Users/mahadev/workspace/ambari-workspace/ambari-git/ambari-server
-derby.system.home=null
-Database Class Loader started - derby.database.classpath=''

ambari-server/pass.txt

@@ -1 +0,0 @@
-AunL9296hfbftkpXj68Kxz68tJICr131TyLva3VqK16q1KmUhu

ambari-server/pom.xml

@@ -96,6 +96,9 @@
             <require>openssl</require>
             <require>${python.ver}</require>
           </requires>
+          <preremoveScriptlet>
+            <script>mv /etc/ambari-server/conf /etc/ambari-server/conf.save</script>
+          </preremoveScriptlet>
           <mappings>
             <mapping>
               <directory>/usr/lib/ambari-server</directory>

ambari-server/src/main/java/org/apache/ambari/eventdb/db/PostgresConnector.java

@@ -440,7 +440,7 @@ public class PostgresConnector implements DBConnector {
     return field.toString() + " >= " + s;
   }
   
-  private static final String WHERE = " where";
+  private static final String WHERE = " where ";
   
   private static String buildSearchClause(String searchTerm, String searchWorkflowId, String searchWorkflowName, String searchWorkflowType,
       String searchUserName, int minJobs, int maxJobs, long minInputBytes, long maxInputBytes, long minOutputBytes, long maxOutputBytes, long minDuration,
@@ -448,7 +448,7 @@ public class PostgresConnector implements DBConnector {
     StringBuilder sb = new StringBuilder();
     sb.append(WHERE);
     if (searchTerm != null && searchTerm.length() > 0) {
-      sb.append(" (");
+      sb.append("(");
       sb.append(like(WorkflowFields.WORKFLOWID, searchTerm));
       sb.append(" or ");
       sb.append(like(WorkflowFields.WORKFLOWNAME, searchTerm));

ambari-server/src/main/java/org/apache/ambari/server/api/handlers/DelegatingRequestHandler.java

@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ambari.server.api.handlers;
-
-import org.apache.ambari.server.api.services.Request;
-import org.apache.ambari.server.api.services.Result;
-
-/**
- * Request handler implementation that all requests are funneled through.
- * Provides common handler functionality and delegates to concrete handler.
- */
-public class DelegatingRequestHandler implements RequestHandler {
-  @Override
-  public Result handleRequest(Request request) {
-    Result result = getRequestHandlerFactory().getRequestHandler(request.getRequestType()).handleRequest(request);
-    request.getResultPostProcessor().process(result);
-
-    return result;
-  }
-
-  /**
-   * Obtain a factory for the request specific concrete request handlers.
-   *
-   * @return A request handler factory
-   */
-  RequestHandlerFactory getRequestHandlerFactory() {
-    return new RequestHandlerFactory();
-  }
-}

ambari-server/src/main/java/org/apache/ambari/server/api/services/BasePersistenceManager.java

@@ -1,41 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ambari.server.api.services;
-
-import org.apache.ambari.server.controller.utilities.ClusterControllerHelper;
-import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.apache.ambari.server.controller.spi.ClusterController;
-import org.apache.ambari.server.controller.spi.Request;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Base PersistenceManager functionality.
- */
-public abstract class BasePersistenceManager implements PersistenceManager {
-
-  protected ClusterController getClusterController() {
-    return ClusterControllerHelper.getClusterController();
-  }
-
-  protected Request createControllerRequest(Set<Map<String, Object>> setProperties) {
-    return PropertyHelper.getCreateRequest(setProperties);
-  }
-}

ambari-server/src/main/java/org/apache/ambari/server/api/services/CreatePersistenceManager.java

@@ -1,63 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ambari.server.api.services;
-
-import org.apache.ambari.server.AmbariException;
-import org.apache.ambari.server.api.resources.ResourceInstance;
-import org.apache.ambari.server.controller.spi.*;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Responsible for persisting the creation of a resource in the back end.
- */
-public class CreatePersistenceManager extends BasePersistenceManager {
-  @Override
-  public RequestStatus persist(ResourceInstance resource, Set<Map<String, Object>> setProperties) {
-    ClusterController controller = getClusterController();
-    Map<Resource.Type, String> mapResourceIds = resource.getIds();
-    Resource.Type type = resource.getResourceDefinition().getType();
-    Schema schema = controller.getSchema(type);
-
-    if (setProperties.size() == 0) {
-      setProperties.add(new HashMap<String, Object>());
-    }
-
-    for (Map<String, Object> mapProperties : setProperties) {
-      for (Map.Entry<Resource.Type, String> entry : mapResourceIds.entrySet()) {
-        String property = schema.getKeyPropertyId(entry.getKey());
-        if (! mapProperties.containsKey(property)) {
-          mapProperties.put(property, entry.getValue());
-        }
-      }
-    }
-
-    try {
-      return controller.createResources(type, createControllerRequest(setProperties));
-    } catch (AmbariException e) {
-      //todo: handle exception
-      throw new RuntimeException("Create of resource failed: " + e, e);
-    } catch (UnsupportedPropertyException e) {
-      //todo: handle exception
-      throw new RuntimeException("Create of resource failed: " + e, e);
-    }
-  }
-}

ambari-server/src/main/java/org/apache/ambari/server/api/services/DeletePersistenceManager.java

@@ -1,48 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ambari.server.api.services;
-
-import org.apache.ambari.server.AmbariException;
-import org.apache.ambari.server.api.resources.ResourceInstance;
-import org.apache.ambari.server.controller.spi.RequestStatus;
-import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
-
-import java.util.Map;
-import java.util.Set;
-
-
-/**
- * Responsible for persisting the deletion of a resource in the back end.
- */
-public class DeletePersistenceManager extends BasePersistenceManager {
-  @Override
-  public RequestStatus persist(ResourceInstance resource, Set<Map<String, Object>> setProperties) {
-    try {
-      //todo: need to account for multiple resources and user predicate
-      return getClusterController().deleteResources(resource.getResourceDefinition().getType(),
-          resource.getQuery().getPredicate());
-    } catch (AmbariException e) {
-      //todo: handle exception
-      throw new RuntimeException("Delete of resource failed: " + e, e);
-    } catch (UnsupportedPropertyException e) {
-      //todo: handle exception
-      throw new RuntimeException("Delete of resource failed: " + e, e);
-    }
-  }
-}

ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistenceManager.java

@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ambari.server.api.services;
-
-import org.apache.ambari.server.api.resources.ResourceInstance;
-import org.apache.ambari.server.controller.spi.RequestStatus;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Persistence manager which is responsible for persisting a resource state to the back end.
- * This includes create, update and delete operations.
- */
-public interface PersistenceManager {
-  /**
-   * Persist a resource to the back end.
-   *
-   *
-   *
-   * @param resource       resource instance for request
-   * @param setProperties  properties to be persisted.
-   *
-   * @return the request state.
-   *
-   */
-  public RequestStatus persist(ResourceInstance resource, Set<Map<String, Object>> setProperties);
-}

ambari-server/src/main/java/org/apache/ambari/server/api/services/QueryCreateRequest.java

@@ -1,60 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.ambari.server.api.services;
-
-import org.apache.ambari.server.api.resources.ResourceInstance;
-
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.UriInfo;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Request for creating sub-resources of instances based on a query.
- */
-public class QueryCreateRequest extends RequestImpl {
-  /**
-   * Constructor.
-   *
-   * @param headers      http headers
-   * @param body         http body
-   * @param uriInfo      uri information
-   * @param requestType  http request type
-   * @param resource     associated resource instance
-   */
-  public QueryCreateRequest(HttpHeaders headers, String body, UriInfo uriInfo, Type requestType, ResourceInstance resource) {
-    super(headers, body, uriInfo, requestType, resource);
-  }
-
-  @Override
-  public Set<Map<String, Object>> getHttpBodyProperties() {
-    String httpBody = getHttpBody();
-    //strip array name
-    int startIdx = httpBody.indexOf("[");
-    int endIdx = httpBody.lastIndexOf("]");
-
-    return getHttpBodyParser().parse(httpBody.substring(startIdx, endIdx + 1));
-  }
-
-  @Override
-  public Type getRequestType() {
-    return Type.QUERY_POST;
-  }
-}

ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestImpl.java

@@ -1,279 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ambari.server.api.services;
-
-import org.apache.ambari.server.api.resources.*;
-import org.apache.ambari.server.api.services.parsers.JsonPropertyParser;
-import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
-import org.apache.ambari.server.api.services.serializers.JsonSerializer;
-import org.apache.ambari.server.api.services.serializers.ResultSerializer;
-import org.apache.ambari.server.controller.internal.TemporalInfoImpl;
-import org.apache.ambari.server.controller.predicate.*;
-import org.apache.ambari.server.controller.spi.Predicate;
-import org.apache.ambari.server.controller.spi.TemporalInfo;
-
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.UriInfo;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Request implementation.
- */
-public class RequestImpl implements Request {
-
-  /**
-   * URI information
-   */
-  private UriInfo m_uriInfo;
-
-  /**
-   * Http headers
-   */
-  private HttpHeaders m_headers;
-
-  /**
-   * Http Body
-   */
-  private String m_body;
-
-  /**
-   * Http request type
-   */
-  private Type m_type;
-
-  /**
-   * Predicate operators.
-   */
-  private Pattern m_pattern = Pattern.compile("!=|>=|<=|=|>|<");
-
-  /**
-   * Associated resource definition
-   */
-  private ResourceInstance m_resource;
-
-
-  /**
-   * Constructor.
-   *
-   * @param headers      http headers
-   * @param body         http body
-   * @param uriInfo      uri information
-   * @param requestType  http request type
-   * @param resource     associated resource definition
-   */
-  public RequestImpl(HttpHeaders headers, String body, UriInfo uriInfo,
-                     Type requestType, ResourceInstance resource) {
-
-    m_headers  = headers;
-    m_body     = body;
-    m_uriInfo  = uriInfo;
-    m_type     = requestType;
-    m_resource = resource;
-  }
-
-  @Override
-  public ResourceInstance getResource() {
-    return m_resource;
-  }
-
-  @Override
-  public String getURI() {
-    try {
-      return URLDecoder.decode(m_uriInfo.getRequestUri().toString(), "UTF-8");
-    } catch (UnsupportedEncodingException e) {
-      throw new RuntimeException("Unable to decode URI: " + e, e);
-    }
-  }
-
-  @Override
-  public Type getRequestType() {
-    return m_type;
-  }
-
-  @Override
-  public int getAPIVersion() {
-    return 0;
-  }
-
-  @Override
-  public Predicate getQueryPredicate() {
-    //todo: parse during init
-    //not using getQueryParameters because it assumes '=' operator
-    String uri = getURI();
-    int qsBegin = uri.indexOf("?");
-
-    if (qsBegin == -1) return null;
-
-    String[] tokens = uri.substring(qsBegin + 1).split("&");
-
-    Set<BasePredicate> setPredicates = new HashSet<BasePredicate>();
-    for (String outerToken : tokens) {
-      if (outerToken != null &&  !outerToken.startsWith("fields")) {
-        setPredicates.add(outerToken.contains("|") ?
-            handleOrPredicate(outerToken) : createPredicate(outerToken));
-      }
-    }
-
-    if (setPredicates.size() == 1) {
-      return setPredicates.iterator().next();
-    } else if (setPredicates.size() > 1) {
-      return new AndPredicate(setPredicates.toArray(new BasePredicate[setPredicates.size()]));
-    } else {
-      return null;
-    }
-  }
-
-  @Override
-  public Map<String, TemporalInfo> getFields() {
-    Map<String, TemporalInfo> mapProperties;
-    String partialResponseFields = m_uriInfo.getQueryParameters().getFirst("fields");
-    if (partialResponseFields == null) {
-      mapProperties = Collections.emptyMap();
-    } else {
-      Set<String> setMatches = new HashSet<String>();
-      // Pattern basically splits a string using ',' as the deliminator unless ',' is between '[' and ']'.
-      // Actually, captures char sequences between ',' and all chars between '[' and ']' including ','.
-      Pattern re = Pattern.compile("[^,\\[]*?\\[[^\\]]*?\\]|[^,]+");
-      Matcher m = re.matcher(partialResponseFields);
-      while (m.find()){
-        for (int groupIdx = 0; groupIdx < m.groupCount() + 1; groupIdx++) {
-          setMatches.add(m.group(groupIdx));
-        }
-      }
-
-      mapProperties = new HashMap<String, TemporalInfo>(setMatches.size());
-      for (String field : setMatches) {
-        TemporalInfo temporalInfo = null;
-        if (field.contains("[")) {
-          String[] temporalData = field.substring(field.indexOf('[') + 1,
-              field.indexOf(']')).split(",");
-          field = field.substring(0, field.indexOf('['));
-          long start = Long.parseLong(temporalData[0].trim());
-          long end   = -1;
-          long step  = -1;
-          if (temporalData.length >= 2) {
-            end = Long.parseLong(temporalData[1].trim());
-            if (temporalData.length == 3) {
-              step = Long.parseLong(temporalData[2].trim());
-            }
-          }
-          temporalInfo = new TemporalInfoImpl(start, end, step);
-        }
-        mapProperties.put(field, temporalInfo);
-      }
-    }
-
-    return mapProperties;
-  }
-
-  @Override
-  public Map<String, List<String>> getHttpHeaders() {
-    return m_headers.getRequestHeaders();
-  }
-
-  @Override
-  public String getHttpBody() {
-    return m_body;
-  }
-
-  @Override
-  public Set<Map<String, Object>> getHttpBodyProperties() {
-    return getHttpBodyParser().parse(getHttpBody());
-  }
-
-  @Override
-  public ResultSerializer getResultSerializer() {
-    return new JsonSerializer();
-  }
-
-  @Override
-  public ResultPostProcessor getResultPostProcessor() {
-    //todo: Need to reconsider post processor creation and association with a resource type.
-    //todo: mutating operations return request resources which aren't children of all resources.
-    return getRequestType() == Type.GET ? new ResultPostProcessorImpl(this) : new NullPostProcessor();
-  }
-
-  @Override
-  public PersistenceManager getPersistenceManager() {
-    switch (getRequestType()) {
-      case POST:
-      case QUERY_POST:
-        return new CreatePersistenceManager();
-      case PUT:
-        return new UpdatePersistenceManager();
-      case DELETE:
-        return new DeletePersistenceManager();
-      case GET:
-        throw new IllegalStateException("Tried to get persistence manager for get operation");
-      default:
-        throw new IllegalStateException("Tried to get persistence manager for unknown operation type");
-    }
-  }
-
-  private BasePredicate createPredicate(String token) {
-
-    Matcher m = m_pattern.matcher(token);
-    m.find();
-
-    String propertyId = token.substring(0, m.start());
-    String     value      = token.substring(m.end());
-    String     operator   = m.group();
-
-    if (operator.equals("=")) {
-      return new EqualsPredicate<String>(propertyId, value);
-    } else if (operator.equals("!=")) {
-      return new NotPredicate(new EqualsPredicate<String>(propertyId, value));
-    } else if (operator.equals("<")) {
-      return new LessPredicate<String>(propertyId, value);
-    } else if (operator.equals(">"))  {
-      return new GreaterPredicate<String>(propertyId, value);
-    } else if (operator.equals("<=")) {
-      return new LessEqualsPredicate<String>(propertyId, value);
-    } else if (operator.equals(">=")) {
-      return new GreaterEqualsPredicate<String>(propertyId, value);
-    } else {
-      throw new RuntimeException("Unknown operator provided in predicate: " + operator);
-    }
-  }
-
-  private BasePredicate handleOrPredicate(String predicate) {
-    Set<BasePredicate> setPredicates = new HashSet<BasePredicate>();
-    String[] tokens = predicate.split("\\|");
-    for (String tok : tokens) {
-      setPredicates.add(createPredicate(tok));
-    }
-
-    return new OrPredicate(setPredicates.toArray(new BasePredicate[setPredicates.size()]));
-  }
-
-  protected RequestBodyParser getHttpBodyParser() {
-    return new JsonPropertyParser();
-  }
-
-  private static class NullPostProcessor implements ResultPostProcessor {
-    @Override
-    public void process(Result result) {
-      //no-op
-    }
-  }
-}

ambari-server/src/main/java/org/apache/ambari/server/api/services/ResponseFactory.java

@@ -1,51 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ambari.server.api.services;
-
-import javax.ws.rs.core.Response;
-
-/**
- * Factory for creating jax-rs responses from results.
- */
-public class ResponseFactory {
-  /**
-   * Create a response from a provided result.
-   *
-   * @param requestType  request type
-   * @param result       the result to wrap
-   * @param synchronous  if the request has been handled synchronously
-   *
-   * @return a new jax-rs Response instance for the provided result
-   */
-  public Response createResponse(Request.Type requestType, Object result, boolean synchronous) {
-
-    int status = 200;
-
-    if (synchronous) {
-      if (requestType == Request.Type.POST) {
-        //todo: for now not providing a url for create
-        status = 201;
-      }
-    } else {
-      status = 202;
-    }
-
-    return Response.status(status).entity(result).build();
-  }
-}

ambari-server/src/main/java/org/apache/ambari/server/api/services/UpdatePersistenceManager.java

@@ -1,48 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ambari.server.api.services;
-
-
-import org.apache.ambari.server.AmbariException;
-import org.apache.ambari.server.api.resources.ResourceInstance;
-import org.apache.ambari.server.controller.spi.RequestStatus;
-import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
-
-import java.util.Map;
-import java.util.Set;
-
-
-/**
- * Responsible for persisting the updating of a resource in the back end.
- */
-public class UpdatePersistenceManager extends BasePersistenceManager {
-  @Override
-  public RequestStatus persist(ResourceInstance resource, Set<Map<String, Object>> setProperties) {
-    try {
-      return getClusterController().updateResources(resource.getResourceDefinition().getType(),
-          createControllerRequest(setProperties), resource.getQuery().getPredicate());
-    } catch (AmbariException e) {
-      //todo: handle exception
-      throw new RuntimeException("Update of resource failed: " + e, e);
-    } catch (UnsupportedPropertyException e) {
-      //todo: handle exception
-      throw new RuntimeException("Update of resource failed: " + e, e);
-    }
-  }
-}

ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java

@@ -434,8 +434,8 @@ public abstract class GangliaPropertyProvider implements PropertyProvider {
           }
         }
       } catch (IOException e) {
-        if (LOG.isDebugEnabled()) {
-          LOG.debug("Caught exception getting Ganglia metrics : spec=" + spec, e);
+        if (LOG.isErrorEnabled()) {
+          LOG.error("Caught exception getting Ganglia metrics : spec=" + spec, e);
         }
       }
       return populatedResources;

ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/MetricsMapping.java

@@ -1,806 +0,0 @@
-package org.apache.ambari.server.controller.ganglia;
-
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- *
- */
-public class MetricsMapping {
-
-  private static String[] metrics = new String[] {
-      "cpu_nice",
-      "cpu_nice",
-      "cpu_wio",
-      "cpu_wio",
-      "cpu_user",
-      "cpu_user",
-      "cpu_idle",
-      "cpu_idle",
-      "cpu_system",
-      "cpu_system",
-      "cpu_aidle",
-      "cpu_aidle",
-      "dfs.datanode.heartBeats_avg_time",
-      "dfs.datanode.heartBeats_avg_time",
-      "dfs.datanode.bytes_written",
-      "dfs.datanode.bytes_written",
-      "dfs.datanode.writes_from_local_client",
-      "dfs.datanode.writes_from_local_client",
-      "dfs.datanode.blocks_verified",
-      "dfs.datanode.blocks_verified",
-      "dfs.datanode.heartBeats_num_ops",
-      "dfs.datanode.heartBeats_num_ops",
-      "dfs.datanode.writeBlockOp_num_ops",
-      "dfs.datanode.writeBlockOp_num_ops",
-      "dfs.datanode.writeBlockOp_avg_time",
-      "dfs.datanode.writeBlockOp_avg_time",
-      "dfs.datanode.blockReports_num_ops",
-      "dfs.datanode.blockReports_num_ops",
-      "dfs.datanode.writes_from_remote_client",
-      "dfs.datanode.writes_from_remote_client",
-      "dfs.datanode.blockReports_avg_time",
-      "dfs.datanode.blockReports_avg_time",
-      "dfs.datanode.blocks_written",
-      "dfs.datanode.blocks_written",
-      "disk_free",
-      "disk_free",
-      "disk_total",
-      "disk_total",
-      "part_max_used",
-      "part_max_used",
-      "hbase.regionserver.deleteRequestLatency_max",
-      "hbase.regionserver.deleteRequestLatency_max",
-      "hbase.regionserver.putRequestLatency_std_dev",
-      "hbase.regionserver.putRequestLatency_std_dev",
-      "hbase.regionserver.putRequestLatency_max",
-      "hbase.regionserver.putRequestLatency_max",
-      "hbase.regionserver.putRequestLatency_num_ops",
-      "hbase.regionserver.putRequestLatency_num_ops",
-      "hbase.regionserver.requests",
-      "hbase.regionserver.requests",
-      "hbase.regionserver.fsReadLatencyHistogram_median",
-      "hbase.regionserver.fsReadLatencyHistogram_median",
-      "hbase.regionserver.deleteRequestLatency_99th_percentile",
-      "hbase.regionserver.deleteRequestLatency_99th_percentile",
-      "hbase.regionserver.writeRequestsCount",
-      "hbase.regionserver.writeRequestsCount",
-      "hbase.regionserver.hdfsBlocksLocalityIndex",
-      "hbase.regionserver.hdfsBlocksLocalityIndex",
-      "hbase.regionserver.compactionQueueSize",
-      "hbase.regionserver.compactionQueueSize",
-      "hbase.regionserver.deleteRequestLatency_mean",
-      "hbase.regionserver.deleteRequestLatency_mean",
-      "hbase.regionserver.totalStaticBloomSizeKB",
-      "hbase.regionserver.totalStaticBloomSizeKB",
-      "hbase.regionserver.flushSize_num_ops",
-      "hbase.regionserver.flushSize_num_ops",
-      "hbase.regionserver.getRequestLatency_99th_percentile",
-      "hbase.regionserver.getRequestLatency_99th_percentile",
-      "hbase.regionserver.flushSize_avg_time",
-      "hbase.regionserver.flushSize_avg_time",
-      "hbase.regionserver.fsWriteLatencyHistogram_95th_percentile",
-      "hbase.regionserver.fsWriteLatencyHistogram_95th_percentile",
-      "hbase.regionserver.flushTime_num_ops",
-      "hbase.regionserver.flushTime_num_ops",
-      "hbase.regionserver.deleteRequestLatency_median",
-      "hbase.regionserver.deleteRequestLatency_median",
-      "hbase.regionserver.blockCacheSize",
-      "hbase.regionserver.blockCacheSize",
-      "hbase.regionserver.fsSyncLatency_num_ops",
-      "hbase.regionserver.fsSyncLatency_num_ops",
-      "hbase.regionserver.storefiles",
-      "hbase.regionserver.storefiles",
-      "hbase.regionserver.getRequestLatency_min",
-      "hbase.regionserver.getRequestLatency_min",
-      "hbase.regionserver.regions",
-      "hbase.regionserver.regions",
-      "hbase.regionserver.fsReadLatencyHistogram_max",
-      "hbase.regionserver.fsReadLatencyHistogram_max",
-      "hbase.regionserver.getRequestLatency_mean",
-      "hbase.regionserver.getRequestLatency_mean",
-      "hbase.regionserver.fsReadLatency_num_ops",
-      "hbase.regionserver.fsReadLatency_num_ops",
-      "hbase.regionserver.blockCacheMissCount",
-      "hbase.regionserver.blockCacheMissCount",
-      "hbase.regionserver.putRequestLatency_75th_percentile",
-      "hbase.regionserver.putRequestLatency_75th_percentile",
-      "hbase.regionserver.fsReadLatencyHistogram_99th_percentile",
-      "hbase.regionserver.fsReadLatencyHistogram_99th_percentile",
-      "hbase.regionserver.totalStaticIndexSizeKB",
-      "hbase.regionserver.totalStaticIndexSizeKB",
-      "hbase.regionserver.compactionTime_avg_time",
-      "hbase.regionserver.compactionTime_avg_time",
-      "hbase.regionserver.fsWriteLatencyHistogram_min",
-      "hbase.regionserver.fsWriteLatencyHistogram_min",
-      "hbase.regionserver.fsSyncLatency_avg_time",
-      "hbase.regionserver.fsSyncLatency_avg_time",
-      "hbase.regionserver.deleteRequestLatency_75th_percentile",
-      "hbase.regionserver.deleteRequestLatency_75th_percentile",
-      "hbase.regionserver.hlogFileCount",
-      "hbase.regionserver.hlogFileCount",
-      "hbase.regionserver.getRequestLatency_std_dev",
-      "hbase.regionserver.getRequestLatency_std_dev",
-      "hbase.regionserver.getRequestLatency_median",
-      "hbase.regionserver.getRequestLatency_median",
-      "hbase.regionserver.putRequestLatency_median",
-      "hbase.regionserver.putRequestLatency_median",
-      "hbase.regionserver.rootIndexSizeKB",
-      "hbase.regionserver.rootIndexSizeKB",
-      "hbase.regionserver.getRequestLatency_num_ops",
-      "hbase.regionserver.getRequestLatency_num_ops",
-      "hbase.regionserver.getRequestLatency_75th_percentile",
-      "hbase.regionserver.getRequestLatency_75th_percentile",
-      "hbase.regionserver.putRequestLatency_95th_percentile",
-      "hbase.regionserver.putRequestLatency_95th_percentile",
-      "hbase.regionserver.fsWriteLatencyHistogram_std_dev",
-      "hbase.regionserver.fsWriteLatencyHistogram_std_dev",
-      "hbase.regionserver.memstoreSizeMB",
-      "hbase.regionserver.memstoreSizeMB",
-      "hbase.regionserver.fsWriteLatencyHistogram_num_ops",
-      "hbase.regionserver.fsWriteLatencyHistogram_num_ops",
-      "hbase.regionserver.deleteRequestLatency_min",
-      "hbase.regionserver.deleteRequestLatency_min",
-      "hbase.regionserver.fsReadLatencyHistogram_75th_percentile",
-      "hbase.regionserver.fsReadLatencyHistogram_75th_percentile",
-      "hbase.regionserver.putRequestLatency_min",
-      "hbase.regionserver.putRequestLatency_min",
-      "hbase.regionserver.fsReadLatencyHistogram_std_dev",
-      "hbase.regionserver.fsReadLatencyHistogram_std_dev",
-      "hbase.regionserver.deleteRequestLatency_std_dev",
-      "hbase.regionserver.deleteRequestLatency_std_dev",
-      "hbase.regionserver.fsReadLatency_avg_time",
-      "hbase.regionserver.fsReadLatency_avg_time",
-      "hbase.regionserver.fsReadLatencyHistogram_num_ops",
-      "hbase.regionserver.fsReadLatencyHistogram_num_ops",
-      "hbase.regionserver.deleteRequestLatency_num_ops",
-      "hbase.regionserver.deleteRequestLatency_num_ops",
-      "hbase.regionserver.blockCacheEvictedCount",
-      "hbase.regionserver.blockCacheEvictedCount",
-      "hbase.regionserver.fsWriteLatencyHistogram_99th_percentile",
-      "hbase.regionserver.fsWriteLatencyHistogram_99th_percentile",
-      "hbase.regionserver.deleteRequestLatency_95th_percentile",
-      "hbase.regionserver.deleteRequestLatency_95th_percentile",
-      "hbase.regionserver.getRequestLatency_max",
-      "hbase.regionserver.getRequestLatency_max",
-      "hbase.regionserver.fsWriteLatencyHistogram_mean",
-      "hbase.regionserver.fsWriteLatencyHistogram_mean",
-      "hbase.regionserver.storefileIndexSizeMB",
-      "hbase.regionserver.storefileIndexSizeMB",
-      "hbase.regionserver.compactionSize_avg_time",
-      "hbase.regionserver.compactionSize_avg_time",
-      "hbase.regionserver.getRequestLatency_95th_percentile",
-      "hbase.regionserver.getRequestLatency_95th_percentile",
-      "hbase.regionserver.flushQueueSize",
-      "hbase.regionserver.flushQueueSize",
-      "hbase.regionserver.compactionSize_num_ops",
-      "hbase.regionserver.compactionSize_num_ops",
-      "hbase.regionserver.putRequestLatency_mean",
-      "hbase.regionserver.putRequestLatency_mean",
-      "hbase.regionserver.compactionTime_num_ops",
-      "hbase.regionserver.compactionTime_num_ops",
-      "hbase.regionserver.stores",
-      "hbase.regionserver.stores",
-      "hbase.regionserver.fsReadLatencyHistogram_min",
-      "hbase.regionserver.fsReadLatencyHistogram_min",
-      "hbase.regionserver.fsWriteLatency_avg_time",
-      "hbase.regionserver.fsWriteLatency_avg_time",
-      "hbase.regionserver.fsReadLatencyHistogram_mean",
-      "hbase.regionserver.fsReadLatencyHistogram_mean",
-      "hbase.regionserver.fsReadLatencyHistogram_95th_percentile",
-      "hbase.regionserver.fsReadLatencyHistogram_95th_percentile",
-      "hbase.regionserver.flushTime_avg_time",
-      "hbase.regionserver.flushTime_avg_time",
-      "hbase.regionserver.fsWriteLatencyHistogram_median",
-      "hbase.regionserver.fsWriteLatencyHistogram_median",
-      "hbase.regionserver.fsWriteLatencyHistogram_max",
-      "hbase.regionserver.fsWriteLatencyHistogram_max",
-      "hbase.regionserver.blockCacheHitCachingRatio",
-      "hbase.regionserver.blockCacheHitCachingRatio",
-      "hbase.regionserver.blockCacheHitCount",
-      "hbase.regionserver.blockCacheHitCount",
-      "hbase.regionserver.blockCacheCount",
-      "hbase.regionserver.blockCacheCount",
-      "hbase.regionserver.readRequestsCount",
-      "hbase.regionserver.readRequestsCount",
-      "hbase.regionserver.blockCacheFree",
-      "hbase.regionserver.blockCacheFree",
-      "hbase.regionserver.putRequestLatency_99th_percentile",
-      "hbase.regionserver.putRequestLatency_99th_percentile",
-      "hbase.regionserver.fsWriteLatencyHistogram_75th_percentile",
-      "hbase.regionserver.fsWriteLatencyHistogram_75th_percentile",
-      "hbase.regionserver.blockCacheHitRatio",
-      "hbase.regionserver.blockCacheHitRatio",
-      "hbase.regionserver.fsWriteLatency_num_ops",
-      "hbase.regionserver.fsWriteLatency_num_ops",
-      "jvm.metrics.gcCount",
-      "jvm.metrics.gcCount",
-      "jvm.metrics.threadsTimedWaiting",
-      "jvm.metrics.threadsTimedWaiting",
-      "jvm.metrics.logWarn",
-      "jvm.metrics.logWarn",
-      "jvm.metrics.threadsBlocked",
-      "jvm.metrics.threadsBlocked",
-      "jvm.metrics.logError",
-      "jvm.metrics.logError",
-      "jvm.metrics.logFatal",
-      "jvm.metrics.logFatal",
-      "jvm.metrics.threadsNew",
-      "jvm.metrics.threadsNew",
-      "jvm.metrics.memHeapCommittedM",
-      "jvm.metrics.memHeapCommittedM",
-      "jvm.metrics.threadsWaiting",
-      "jvm.metrics.threadsWaiting",
-      "jvm.metrics.memNonHeapCommittedM",
-      "jvm.metrics.memNonHeapCommittedM",
-      "jvm.metrics.maxMemoryM",
-      "jvm.metrics.maxMemoryM",
-      "jvm.metrics.threadsTerminated",
-      "jvm.metrics.threadsTerminated",
-      "jvm.metrics.threadsRunnable",
-      "jvm.metrics.threadsRunnable",
-      "jvm.metrics.memNonHeapUsedM",
-      "jvm.metrics.memNonHeapUsedM",
-      "jvm.metrics.gcTimeMillis",
-      "jvm.metrics.gcTimeMillis",
-      "jvm.metrics.memHeapUsedM",
-      "jvm.metrics.memHeapUsedM",
-      "jvm.metrics.logInfo",
-      "jvm.metrics.logInfo",
-      "load_one",
-      "load_one",
-      "load_five",
-      "load_five",
-      "load_fifteen",
-      "load_fifteen",
-      "mapred.shuffleOutput.shuffle_handler_busy_percent",
-      "mapred.shuffleOutput.shuffle_handler_busy_percent",
-      "mapred.tasktracker.reduces_running",
-      "mapred.tasktracker.reduces_running",
-      "mapred.tasktracker.reduceTaskSlots",
-      "mapred.tasktracker.reduceTaskSlots",
-      "mapred.tasktracker.maps_running",
-      "mapred.tasktracker.maps_running",
-      "mapred.tasktracker.mapTaskSlots",
-      "mapred.tasktracker.mapTaskSlots",
-      "swap_free",
-      "swap_free",
-      "mem_cached",
-      "mem_cached",
-      "mem_free",
-      "mem_free",
-      "mem_buffers",
-      "mem_buffers",
-      "mem_shared",
-      "mem_shared",
-      "metricssystem.MetricsSystem.publish_max_time",
-      "metricssystem.MetricsSystem.publish_max_time",
-      "metricssystem.MetricsSystem.publish_num_ops",
-      "metricssystem.MetricsSystem.publish_num_ops",
-      "metricssystem.MetricsSystem.snapshot_stdev_time",
-      "metricssystem.MetricsSystem.snapshot_stdev_time",
-      "metricssystem.MetricsSystem.snapshot_imax_time",
-      "metricssystem.MetricsSystem.snapshot_imax_time",
-      "metricssystem.MetricsSystem.num_sinks",
-      "metricssystem.MetricsSystem.num_sinks",
-      "metricssystem.MetricsSystem.snapshot_min_time",
-      "metricssystem.MetricsSystem.snapshot_min_time",
-      "metricssystem.MetricsSystem.snapshot_num_ops",
-      "metricssystem.MetricsSystem.snapshot_num_ops",
-      "metricssystem.MetricsSystem.snapshot_avg_time",
-      "metricssystem.MetricsSystem.snapshot_avg_time",
-      "metricssystem.MetricsSystem.dropped_pub_all",
-      "metricssystem.MetricsSystem.dropped_pub_all",
-      "metricssystem.MetricsSystem.sink.ganglia.latency_avg_time",
-      "metricssystem.MetricsSystem.sink.ganglia.latency_avg_time",
-      "metricssystem.MetricsSystem.publish_stdev_time",
-      "metricssystem.MetricsSystem.publish_stdev_time",
-      "metricssystem.MetricsSystem.publish_imin_time",
-      "metricssystem.MetricsSystem.publish_imin_time",
-      "metricssystem.MetricsSystem.num_sources",
-      "metricssystem.MetricsSystem.num_sources",
-      "metricssystem.MetricsSystem.snapshot_max_time",
-      "metricssystem.MetricsSystem.snapshot_max_time",
-      "metricssystem.MetricsSystem.sink.ganglia.latency_num_ops",
-      "metricssystem.MetricsSystem.sink.ganglia.latency_num_ops",
-      "metricssystem.MetricsSystem.publish_imax_time",
-      "metricssystem.MetricsSystem.publish_imax_time",
-      "metricssystem.MetricsSystem.publish_min_time",
-      "metricssystem.MetricsSystem.publish_min_time",
-      "metricssystem.MetricsSystem.publish_avg_time",
-      "metricssystem.MetricsSystem.publish_avg_time",
-      "metricssystem.MetricsSystem.snapshot_imin_time",
-      "metricssystem.MetricsSystem.snapshot_imin_time",
-      "bytes_out",
-      "bytes_out",
-      "pkts_in",
-      "pkts_in",
-      "pkts_out",
-      "pkts_out",
-      "bytes_in",
-      "bytes_in",
-      "proc_total",
-      "proc_total",
-      "proc_run",
-      "proc_run",
-      "rpc.metrics.getRegionInfo_num_ops",
-      "rpc.metrics.getRegionInfo_num_ops",
-      "rpc.metrics.isStopped_avg_time",
-      "rpc.metrics.isStopped_avg_time",
-      "rpc.metrics.RpcQueueTime_avg_time",
-      "rpc.metrics.RpcQueueTime_avg_time",
-      "rpc.metrics.isMasterRunning_avg_time",
-      "rpc.metrics.isMasterRunning_avg_time",
-      "rpc.metrics.delete_num_ops",
-      "rpc.metrics.delete_num_ops",
-      "rpc.metrics.getClusterStatus_avg_time",
-      "rpc.metrics.getClusterStatus_avg_time",
-      "rpc.metrics.getFromOnlineRegions_num_ops",
-      "rpc.metrics.getFromOnlineRegions_num_ops",
-      "rpc.metrics.flushRegion_avg_time",
-      "rpc.metrics.flushRegion_avg_time",
-      "rpc.metrics.getClosestRowBefore_num_ops",
-      "rpc.metrics.getClosestRowBefore_num_ops",
-      "rpc.metrics.ReceivedBytes",
-      "rpc.metrics.ReceivedBytes",
-      "rpc.metrics.addToOnlineRegions_avg_time",
-      "rpc.metrics.addToOnlineRegions_avg_time",
-      "rpc.metrics.splitRegion_avg_time",
-      "rpc.metrics.splitRegion_avg_time",
-      "rpc.metrics.regionServerReport_num_ops",
-      "rpc.metrics.regionServerReport_num_ops",
-      "rpc.metrics.getProtocolSignature_num_ops",
-      "rpc.metrics.getProtocolSignature_num_ops",
-      "rpc.metrics.offline_avg_time",
-      "rpc.metrics.offline_avg_time",
-      "rpc.metrics.checkAndDelete_num_ops",
-      "rpc.metrics.checkAndDelete_num_ops",
-      "rpc.metrics.abort_avg_time",
-      "rpc.metrics.abort_avg_time",
-      "rpc.metrics.openScanner_avg_time",
-      "rpc.metrics.openScanner_avg_time",
-      "rpc.metrics.removeFromOnlineRegions_num_ops",
-      "rpc.metrics.removeFromOnlineRegions_num_ops",
-      "rpc.metrics.stop_num_ops",
-      "rpc.metrics.stop_num_ops",
-      "rpc.metrics.shutdown_num_ops",
-      "rpc.metrics.shutdown_num_ops",
-      "rpc.metrics.getCatalogTracker_avg_time",
-      "rpc.metrics.getCatalogTracker_avg_time",
-      "rpc.metrics.regionServerStartup_avg_time",
-      "rpc.metrics.regionServerStartup_avg_time",
-      "rpc.metrics.disableTable_num_ops",
-      "rpc.metrics.disableTable_num_ops",
-      "rpc.metrics.getClosestRowBefore_avg_time",
-      "rpc.metrics.getClosestRowBefore_avg_time",
-      "rpc.metrics.move_num_ops",
-      "rpc.metrics.move_num_ops",
-      "rpc.metrics.disableTable_avg_time",
-      "rpc.metrics.disableTable_avg_time",
-      "rpc.metrics.assign_num_ops",
-      "rpc.metrics.assign_num_ops",
-      "rpc.metrics.balanceSwitch_num_ops",
-      "rpc.metrics.balanceSwitch_num_ops",
-      "rpc.metrics.getConfiguration_num_ops",
-      "rpc.metrics.getConfiguration_num_ops",
-      "rpc.metrics.createTable_num_ops",
-      "rpc.metrics.createTable_num_ops",
-      "rpc.metrics.getHTableDescriptors_num_ops",
-      "rpc.metrics.getHTableDescriptors_num_ops",
-      "rpc.metrics.exists_avg_time",
-      "rpc.metrics.exists_avg_time",
-      "rpc.metrics.lockRow_avg_time",
-      "rpc.metrics.lockRow_avg_time",
-      "rpc.metrics.openRegions_avg_time",
-      "rpc.metrics.openRegions_avg_time",
-      "rpc.metrics.bulkLoadHFiles_num_ops",
-      "rpc.metrics.bulkLoadHFiles_num_ops",
-      "rpc.metrics.RpcSlowResponse_avg_time",
-      "rpc.metrics.RpcSlowResponse_avg_time",
-      "rpc.metrics.incrementColumnValue_avg_time",
-      "rpc.metrics.incrementColumnValue_avg_time",
-      "rpc.metrics.execCoprocessor_avg_time",
-      "rpc.metrics.execCoprocessor_avg_time",
-      "rpc.metrics.openRegion_avg_time",
-      "rpc.metrics.openRegion_avg_time",
-      "rpc.metrics.getOnlineRegions_avg_time",
-      "rpc.metrics.getOnlineRegions_avg_time",
-      "rpc.metrics.closeRegion_num_ops",
-      "rpc.metrics.closeRegion_num_ops",
-      "rpc.metrics.enableTable_avg_time",
-      "rpc.metrics.enableTable_avg_time",
-      "rpc.metrics.replicateLogEntries_avg_time",
-      "rpc.metrics.replicateLogEntries_avg_time",
-      "rpc.metrics.NumOpenConnections",
-      "rpc.metrics.NumOpenConnections",
-      "rpc.metrics.getRegionInfo_avg_time",
-      "rpc.metrics.getRegionInfo_avg_time",
-      "rpc.metrics.exists_num_ops",
-      "rpc.metrics.exists_num_ops",
-      "rpc.metrics.compactRegion_num_ops",
-      "rpc.metrics.compactRegion_num_ops",
-      "rpc.metrics.checkAndDelete_avg_time",
-      "rpc.metrics.checkAndDelete_avg_time",
-      "rpc.metrics.unassign_num_ops",
-      "rpc.metrics.unassign_num_ops",
-      "rpc.metrics.createTable_avg_time",
-      "rpc.metrics.createTable_avg_time",
-      "rpc.metrics.getHTableDescriptors_avg_time",
-      "rpc.metrics.getHTableDescriptors_avg_time",
-      "rpc.metrics.rollHLogWriter_num_ops",
-      "rpc.metrics.rollHLogWriter_num_ops",
-      "rpc.metrics.closeRegion_avg_time",
-      "rpc.metrics.closeRegion_avg_time",
-      "rpc.metrics.RpcQueueTime_num_ops",
-      "rpc.metrics.RpcQueueTime_num_ops",
-      "rpc.metrics.isMasterRunning_num_ops",
-      "rpc.metrics.isMasterRunning_num_ops",
-      "rpc.metrics.getClusterStatus_num_ops",
-      "rpc.metrics.getClusterStatus_num_ops",
-      "rpc.metrics.isStopped_num_ops",
-      "rpc.metrics.isStopped_num_ops",
-      "rpc.metrics.checkAndPut_num_ops",
-      "rpc.metrics.checkAndPut_num_ops",
-      "rpc.metrics.isAborted_num_ops",
-      "rpc.metrics.isAborted_num_ops",
-      "rpc.metrics.RpcProcessingTime_num_ops",
-      "rpc.metrics.RpcProcessingTime_num_ops",
-      "rpc.metrics.rollHLogWriter_avg_time",
-      "rpc.metrics.rollHLogWriter_avg_time",
-      "rpc.metrics.openRegions_num_ops",
-      "rpc.metrics.openRegions_num_ops",
-      "rpc.metrics.lockRow_num_ops",
-      "rpc.metrics.lockRow_num_ops",
-      "rpc.metrics.unlockRow_avg_time",
-      "rpc.metrics.unlockRow_avg_time",
-      "rpc.metrics.close_num_ops",
-      "rpc.metrics.close_num_ops",
-      "rpc.metrics.getZooKeeper_avg_time",
-      "rpc.metrics.getZooKeeper_avg_time",
-      "rpc.metrics.reportRSFatalError_avg_time",
-      "rpc.metrics.reportRSFatalError_avg_time",
-      "rpc.metrics.unlockRow_num_ops",
-      "rpc.metrics.unlockRow_num_ops",
-      "rpc.metrics.flushRegion_num_ops",
-      "rpc.metrics.flushRegion_num_ops",
-      "rpc.metrics.stopMaster_avg_time",
-      "rpc.metrics.stopMaster_avg_time",
-      "rpc.metrics.getBlockCacheColumnFamilySummaries_num_ops",
-      "rpc.metrics.getBlockCacheColumnFamilySummaries_num_ops",
-      "rpc.metrics.getServerName_avg_time",
-      "rpc.metrics.getServerName_avg_time",
-      "rpc.metrics.getHServerInfo_avg_time",
-      "rpc.metrics.getHServerInfo_avg_time",
-      "rpc.metrics.RpcSlowResponse_num_ops",
-      "rpc.metrics.RpcSlowResponse_num_ops",
-      "rpc.metrics.increment_avg_time",
-      "rpc.metrics.increment_avg_time",
-      "rpc.metrics.getFromOnlineRegions_avg_time",
-      "rpc.metrics.getFromOnlineRegions_avg_time",
-      "rpc.metrics.get_num_ops",
-      "rpc.metrics.get_num_ops",
-      "rpc.metrics.reportRSFatalError_num_ops",
-      "rpc.metrics.reportRSFatalError_num_ops",
-      "rpc.metrics.getZooKeeper_num_ops",
-      "rpc.metrics.getZooKeeper_num_ops",
-      "rpc.metrics.shutdown_avg_time",
-      "rpc.metrics.shutdown_avg_time",
-      "rpc.metrics.stop_avg_time",
-      "rpc.metrics.stop_avg_time",
-      "rpc.metrics.splitRegion_num_ops",
-      "rpc.metrics.splitRegion_num_ops",
-      "rpc.metrics.addToOnlineRegions_num_ops",
-      "rpc.metrics.addToOnlineRegions_num_ops",
-      "rpc.metrics.bulkLoadHFiles_avg_time",
-      "rpc.metrics.bulkLoadHFiles_avg_time",
-      "rpc.metrics.deleteTable_num_ops",
-      "rpc.metrics.deleteTable_num_ops",
-      "rpc.metrics.getProtocolVersion_num_ops",
-      "rpc.metrics.getProtocolVersion_num_ops",
-      "rpc.metrics.next_num_ops",
-      "rpc.metrics.next_num_ops",
-      "rpc.metrics.RpcProcessingTime_avg_time",
-      "rpc.metrics.RpcProcessingTime_avg_time",
-      "rpc.metrics.execCoprocessor_num_ops",
-      "rpc.metrics.execCoprocessor_num_ops",
-      "rpc.metrics.checkAndPut_avg_time",
-      "rpc.metrics.checkAndPut_avg_time",
-      "rpc.metrics.isAborted_avg_time",
-      "rpc.metrics.isAborted_avg_time",
-      "rpc.metrics.incrementColumnValue_num_ops",
-      "rpc.metrics.incrementColumnValue_num_ops",
-      "rpc.metrics.deleteColumn_num_ops",
-      "rpc.metrics.deleteColumn_num_ops",
-      "rpc.metrics.getBlockCacheColumnFamilySummaries_avg_time",
-      "rpc.metrics.getBlockCacheColumnFamilySummaries_avg_time",
-      "rpc.metrics.checkOOME_num_ops",
-      "rpc.metrics.checkOOME_num_ops",
-      "rpc.metrics.getProtocolVersion_avg_time",
-      "rpc.metrics.getProtocolVersion_avg_time",
-      "rpc.metrics.deleteTable_avg_time",
-      "rpc.metrics.deleteTable_avg_time",
-      "rpc.metrics.next_avg_time",
-      "rpc.metrics.next_avg_time",
-      "rpc.metrics.rpcAuthorizationSuccesses",
-      "rpc.metrics.rpcAuthorizationSuccesses",
-      "rpc.metrics.addColumn_avg_time",
-      "rpc.metrics.addColumn_avg_time",
-      "rpc.metrics.getOnlineRegions_num_ops",
-      "rpc.metrics.getOnlineRegions_num_ops",
-      "rpc.metrics.modifyColumn_avg_time",
-      "rpc.metrics.modifyColumn_avg_time",
-      "rpc.metrics.getAlterStatus_avg_time",
-      "rpc.metrics.getAlterStatus_avg_time",
-      "rpc.metrics.openRegion_num_ops",
-      "rpc.metrics.openRegion_num_ops",
-      "rpc.metrics.multi_avg_time",
-      "rpc.metrics.multi_avg_time",
-      "rpc.metrics.put_avg_time",
-      "rpc.metrics.put_avg_time",
-      "rpc.metrics.SentBytes",
-      "rpc.metrics.SentBytes",
-      "rpc.metrics.stopMaster_num_ops",
-      "rpc.metrics.stopMaster_num_ops",
-      "rpc.metrics.callQueueLen",
-      "rpc.metrics.callQueueLen",
-      "rpc.metrics.getProtocolSignature_avg_time",
-      "rpc.metrics.getProtocolSignature_avg_time",
-      "rpc.metrics.regionServerReport_avg_time",
-      "rpc.metrics.regionServerReport_avg_time",
-      "rpc.metrics.getConfiguration_avg_time",
-      "rpc.metrics.getConfiguration_avg_time",
-      "rpc.metrics.offline_num_ops",
-      "rpc.metrics.offline_num_ops",
-      "rpc.metrics.move_avg_time",
-      "rpc.metrics.move_avg_time",
-      "rpc.metrics.assign_avg_time",
-      "rpc.metrics.assign_avg_time",
-      "rpc.metrics.balanceSwitch_avg_time",
-      "rpc.metrics.balanceSwitch_avg_time",
-      "rpc.metrics.addColumn_num_ops",
-      "rpc.metrics.addColumn_num_ops",
-      "rpc.metrics.rpcAuthorizationFailures",
-      "rpc.metrics.rpcAuthorizationFailures",
-      "rpc.metrics.unassign_avg_time",
-      "rpc.metrics.unassign_avg_time",
-      "rpc.metrics.enableTable_num_ops",
-      "rpc.metrics.enableTable_num_ops",
-      "rpc.metrics.compactRegion_avg_time",
-      "rpc.metrics.compactRegion_avg_time",
-      "rpc.metrics.balance_num_ops",
-      "rpc.metrics.balance_num_ops",
-      "rpc.metrics.modifyTable_num_ops",
-      "rpc.metrics.modifyTable_num_ops",
-      "rpc.metrics.close_avg_time",
-      "rpc.metrics.close_avg_time",
-      "rpc.metrics.getHServerInfo_num_ops",
-      "rpc.metrics.getHServerInfo_num_ops",
-      "rpc.metrics.get_avg_time",
-      "rpc.metrics.get_avg_time",
-      "rpc.metrics.getServerName_num_ops",
-      "rpc.metrics.getServerName_num_ops",
-      "rpc.metrics.openScanner_num_ops",
-      "rpc.metrics.openScanner_num_ops",
-      "rpc.metrics.deleteColumn_avg_time",
-      "rpc.metrics.deleteColumn_avg_time",
-      "rpc.metrics.checkOOME_avg_time",
-      "rpc.metrics.checkOOME_avg_time",
-      "rpc.metrics.abort_num_ops",
-      "rpc.metrics.abort_num_ops",
-      "rpc.metrics.modifyColumn_num_ops",
-      "rpc.metrics.modifyColumn_num_ops",
-      "rpc.metrics.getAlterStatus_num_ops",
-      "rpc.metrics.getAlterStatus_num_ops",
-      "rpc.metrics.replicateLogEntries_num_ops",
-      "rpc.metrics.replicateLogEntries_num_ops",
-      "rpc.metrics.modifyTable_avg_time",
-      "rpc.metrics.modifyTable_avg_time",
-      "rpc.metrics.balance_avg_time",
-      "rpc.metrics.balance_avg_time",
-      "rpc.metrics.rpcAuthenticationFailures",
-      "rpc.metrics.rpcAuthenticationFailures",
-      "rpc.metrics.rpcAuthenticationSuccesses",
-      "rpc.metrics.rpcAuthenticationSuccesses",
-      "rpc.metrics.delete_avg_time",
-      "rpc.metrics.delete_avg_time",
-      "rpc.metrics.increment_num_ops",
-      "rpc.metrics.increment_num_ops",
-      "rpc.metrics.getCatalogTracker_num_ops",
-      "rpc.metrics.getCatalogTracker_num_ops",
-      "rpc.metrics.regionServerStartup_num_ops",
-      "rpc.metrics.regionServerStartup_num_ops",
-      "rpc.metrics.removeFromOnlineRegions_avg_time",
-      "rpc.metrics.removeFromOnlineRegions_avg_time",
-      "rpc.metrics.multi_num_ops",
-      "rpc.metrics.multi_num_ops",
-      "rpc.metrics.put_num_ops",
-      "rpc.metrics.put_num_ops",
-      "rpc.metrics.abort.aboveOneSec._num_ops",
-      "rpc.metrics.abort.aboveOneSec._num_ops",
-      "rpc.metrics.abort.aboveOneSec._avg_time",
-      "rpc.metrics.abort.aboveOneSec._avg_time",
-      "rpc.metrics.addToOnlineRegions.aboveOneSec._avg_time",
-      "rpc.metrics.addToOnlineRegions.aboveOneSec._avg_time",
-      "rpc.metrics.addToOnlineRegions.aboveOneSec._num_ops",
-      "rpc.metrics.addToOnlineRegions.aboveOneSec._num_ops",
-      "rpc.metrics.bulkLoadHFiles.aboveOneSec._avg_time",
-      "rpc.metrics.bulkLoadHFiles.aboveOneSec._avg_time",
-      "rpc.metrics.bulkLoadHFiles.aboveOneSec._num_ops",
-      "rpc.metrics.bulkLoadHFiles.aboveOneSec._num_ops",
-      "rpc.metrics.checkAndDelete.aboveOneSec._avg_time",
-      "rpc.metrics.checkAndDelete.aboveOneSec._avg_time",
-      "rpc.metrics.checkAndDelete.aboveOneSec._num_ops",
-      "rpc.metrics.checkAndDelete.aboveOneSec._num_ops",
-      "rpc.metrics.checkAndPut.aboveOneSec._avg_time",
-      "rpc.metrics.checkAndPut.aboveOneSec._avg_time",
-      "rpc.metrics.checkAndPut.aboveOneSec._num_ops",
-      "rpc.metrics.checkAndPut.aboveOneSec._num_ops",
-      "rpc.metrics.checkOOME.aboveOneSec._num_ops",
-      "rpc.metrics.checkOOME.aboveOneSec._num_ops",
-      "rpc.metrics.checkOOME.aboveOneSec._avg_time",
-      "rpc.metrics.checkOOME.aboveOneSec._avg_time",
-      "rpc.metrics.close.aboveOneSec._avg_time",
-      "rpc.metrics.close.aboveOneSec._avg_time",
-      "rpc.metrics.close.aboveOneSec._num_ops",
-      "rpc.metrics.close.aboveOneSec._num_ops",
-      "rpc.metrics.closeRegion.aboveOneSec._avg_time",
-      "rpc.metrics.closeRegion.aboveOneSec._avg_time",
-      "rpc.metrics.closeRegion.aboveOneSec._num_ops",
-      "rpc.metrics.closeRegion.aboveOneSec._num_ops",
-      "rpc.metrics.compactRegion.aboveOneSec._num_ops",
-      "rpc.metrics.compactRegion.aboveOneSec._num_ops",
-      "rpc.metrics.compactRegion.aboveOneSec._avg_time",
-      "rpc.metrics.compactRegion.aboveOneSec._avg_time",
-      "rpc.metrics.delete.aboveOneSec._num_ops",
-      "rpc.metrics.delete.aboveOneSec._num_ops",
-      "rpc.metrics.delete.aboveOneSec._avg_time",
-      "rpc.metrics.delete.aboveOneSec._avg_time",
-      "rpc.metrics.execCoprocessor.aboveOneSec._avg_time",
-      "rpc.metrics.execCoprocessor.aboveOneSec._avg_time",
-      "rpc.metrics.execCoprocessor.aboveOneSec._num_ops",
-      "rpc.metrics.execCoprocessor.aboveOneSec._num_ops",
-      "rpc.metrics.exists.aboveOneSec._num_ops",
-      "rpc.metrics.exists.aboveOneSec._num_ops",
-      "rpc.metrics.exists.aboveOneSec._avg_time",
-      "rpc.metrics.exists.aboveOneSec._avg_time",
-      "rpc.metrics.flushRegion.aboveOneSec._avg_time",
-      "rpc.metrics.flushRegion.aboveOneSec._avg_time",
-      "rpc.metrics.flushRegion.aboveOneSec._num_ops",
-      "rpc.metrics.flushRegion.aboveOneSec._num_ops",
-      "rpc.metrics.get.aboveOneSec._avg_time",
-      "rpc.metrics.get.aboveOneSec._avg_time",
-      "rpc.metrics.get.aboveOneSec._num_ops",
-      "rpc.metrics.get.aboveOneSec._num_ops",
-      "rpc.metrics.getBlockCacheColumnFamilySummaries.aboveOneSec._num_ops",
-      "rpc.metrics.getBlockCacheColumnFamilySummaries.aboveOneSec._num_ops",
-      "rpc.metrics.getBlockCacheColumnFamilySummaries.aboveOneSec._avg_time",
-      "rpc.metrics.getBlockCacheColumnFamilySummaries.aboveOneSec._avg_time",
-      "rpc.metrics.getCatalogTracker.aboveOneSec._avg_time",
-      "rpc.metrics.getCatalogTracker.aboveOneSec._avg_time",
-      "rpc.metrics.getCatalogTracker.aboveOneSec._num_ops",
-      "rpc.metrics.getCatalogTracker.aboveOneSec._num_ops",
-      "rpc.metrics.getClosestRowBefore.aboveOneSec._avg_time",
-      "rpc.metrics.getClosestRowBefore.aboveOneSec._avg_time",
-      "rpc.metrics.getClosestRowBefore.aboveOneSec._num_ops",
-      "rpc.metrics.getClosestRowBefore.aboveOneSec._num_ops",
-      "rpc.metrics.getConfiguration.aboveOneSec._num_ops",
-      "rpc.metrics.getConfiguration.aboveOneSec._num_ops",
-      "rpc.metrics.getConfiguration.aboveOneSec._avg_time",
-      "rpc.metrics.getConfiguration.aboveOneSec._avg_time",
-      "rpc.metrics.getFromOnlineRegions.aboveOneSec._num_ops",
-      "rpc.metrics.getFromOnlineRegions.aboveOneSec._num_ops",
-      "rpc.metrics.getFromOnlineRegions.aboveOneSec._avg_time",
-      "rpc.metrics.getFromOnlineRegions.aboveOneSec._avg_time",
-      "rpc.metrics.getHServerInfo.aboveOneSec._num_ops",
-      "rpc.metrics.getHServerInfo.aboveOneSec._num_ops",
-      "rpc.metrics.getHServerInfo.aboveOneSec._avg_time",
-      "rpc.metrics.getHServerInfo.aboveOneSec._avg_time",
-      "rpc.metrics.getOnlineRegions.aboveOneSec._avg_time",
-      "rpc.metrics.getOnlineRegions.aboveOneSec._avg_time",
-      "rpc.metrics.getOnlineRegions.aboveOneSec._num_ops",
-      "rpc.metrics.getOnlineRegions.aboveOneSec._num_ops",
-      "rpc.metrics.getProtocolSignature.aboveOneSec._avg_time",
-      "rpc.metrics.getProtocolSignature.aboveOneSec._avg_time",
-      "rpc.metrics.getProtocolSignature.aboveOneSec._num_ops",
-      "rpc.metrics.getProtocolSignature.aboveOneSec._num_ops",
-      "rpc.metrics.getProtocolVersion.aboveOneSec._num_ops",
-      "rpc.metrics.getProtocolVersion.aboveOneSec._num_ops",
-      "rpc.metrics.getProtocolVersion.aboveOneSec._avg_time",
-      "rpc.metrics.getProtocolVersion.aboveOneSec._avg_time",
-      "rpc.metrics.getRegionInfo.aboveOneSec._num_ops",
-      "rpc.metrics.getRegionInfo.aboveOneSec._num_ops",
-      "rpc.metrics.getRegionInfo.aboveOneSec._avg_time",
-      "rpc.metrics.getRegionInfo.aboveOneSec._avg_time",
-      "rpc.metrics.getServerName.aboveOneSec._num_ops",
-      "rpc.metrics.getServerName.aboveOneSec._num_ops",
-      "rpc.metrics.getServerName.aboveOneSec._avg_time",
-      "rpc.metrics.getServerName.aboveOneSec._avg_time",
-      "rpc.metrics.getZooKeeper.aboveOneSec._num_ops",
-      "rpc.metrics.getZooKeeper.aboveOneSec._num_ops",
-      "rpc.metrics.getZooKeeper.aboveOneSec._avg_time",
-      "rpc.metrics.getZooKeeper.aboveOneSec._avg_time",
-      "rpc.metrics.increment.aboveOneSec._num_ops",
-      "rpc.metrics.increment.aboveOneSec._num_ops",
-      "rpc.metrics.increment.aboveOneSec._avg_time",
-      "rpc.metrics.increment.aboveOneSec._avg_time",
-      "rpc.metrics.incrementColumnValue.aboveOneSec._avg_time",
-      "rpc.metrics.incrementColumnValue.aboveOneSec._avg_time",
-      "rpc.metrics.incrementColumnValue.aboveOneSec._num_ops",
-      "rpc.metrics.incrementColumnValue.aboveOneSec._num_ops",
-      "rpc.metrics.isAborted.aboveOneSec._avg_time",
-      "rpc.metrics.isAborted.aboveOneSec._avg_time",
-      "rpc.metrics.isAborted.aboveOneSec._num_ops",
-      "rpc.metrics.isAborted.aboveOneSec._num_ops",
-      "rpc.metrics.isStopped.aboveOneSec._avg_time",
-      "rpc.metrics.isStopped.aboveOneSec._avg_time",
-      "rpc.metrics.isStopped.aboveOneSec._num_ops",
-      "rpc.metrics.isStopped.aboveOneSec._num_ops",
-      "rpc.metrics.lockRow.aboveOneSec._num_ops",
-      "rpc.metrics.lockRow.aboveOneSec._num_ops",
-      "rpc.metrics.lockRow.aboveOneSec._avg_time",
-      "rpc.metrics.lockRow.aboveOneSec._avg_time",
-      "rpc.metrics.multi.aboveOneSec._num_ops",
-      "rpc.metrics.multi.aboveOneSec._num_ops",
-      "rpc.metrics.multi.aboveOneSec._avg_time",
-      "rpc.metrics.multi.aboveOneSec._avg_time",
-      "rpc.metrics.next.aboveOneSec._num_ops",
-      "rpc.metrics.next.aboveOneSec._num_ops",
-      "rpc.metrics.next.aboveOneSec._avg_time",
-      "rpc.metrics.next.aboveOneSec._avg_time",
-      "rpc.metrics.openRegion.aboveOneSec._avg_time",
-      "rpc.metrics.openRegion.aboveOneSec._avg_time",
-      "rpc.metrics.openRegion.aboveOneSec._num_ops",
-      "rpc.metrics.openRegion.aboveOneSec._num_ops",
-      "rpc.metrics.openRegions.aboveOneSec._num_ops",
-      "rpc.metrics.openRegions.aboveOneSec._num_ops",
-      "rpc.metrics.openRegions.aboveOneSec._avg_time",
-      "rpc.metrics.openRegions.aboveOneSec._avg_time",
-      "rpc.metrics.openScanner.aboveOneSec._num_ops",
-      "rpc.metrics.openScanner.aboveOneSec._num_ops",
-      "rpc.metrics.openScanner.aboveOneSec._avg_time",
-      "rpc.metrics.openScanner.aboveOneSec._avg_time",
-      "rpc.metrics.put.aboveOneSec._num_ops",
-      "rpc.metrics.put.aboveOneSec._num_ops",
-      "rpc.metrics.put.aboveOneSec._avg_time",
-      "rpc.metrics.put.aboveOneSec._avg_time",
-      "rpc.metrics.removeFromOnlineRegions.aboveOneSec._avg_time",
-      "rpc.metrics.removeFromOnlineRegions.aboveOneSec._avg_time",
-      "rpc.metrics.removeFromOnlineRegions.aboveOneSec._num_ops",
-      "rpc.metrics.removeFromOnlineRegions.aboveOneSec._num_ops",
-      "rpc.metrics.replicateLogEntries.aboveOneSec._avg_time",
-      "rpc.metrics.replicateLogEntries.aboveOneSec._avg_time",
-      "rpc.metrics.replicateLogEntries.aboveOneSec._num_ops",
-      "rpc.metrics.replicateLogEntries.aboveOneSec._num_ops",
-      "rpc.metrics.rollHLogWriter.aboveOneSec._avg_time",
-      "rpc.metrics.rollHLogWriter.aboveOneSec._avg_time",
-      "rpc.metrics.rollHLogWriter.aboveOneSec._num_ops",
-      "rpc.metrics.rollHLogWriter.aboveOneSec._num_ops",
-      "rpc.metrics.splitRegion.aboveOneSec._avg_time",
-      "rpc.metrics.splitRegion.aboveOneSec._avg_time",
-      "rpc.metrics.splitRegion.aboveOneSec._num_ops",
-      "rpc.metrics.splitRegion.aboveOneSec._num_ops",
-      "rpc.metrics.stop.aboveOneSec._num_ops",
-      "rpc.metrics.stop.aboveOneSec._num_ops",
-      "rpc.metrics.stop.aboveOneSec._avg_time",
-      "rpc.metrics.stop.aboveOneSec._avg_time",
-      "rpc.metrics.unlockRow.aboveOneSec._num_ops",
-      "rpc.metrics.unlockRow.aboveOneSec._num_ops",
-      "rpc.metrics.unlockRow.aboveOneSec._avg_time",
-      "rpc.metrics.unlockRow.aboveOneSec._avg_time"
-  };
-}

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java

@@ -46,16 +46,11 @@ import java.util.Set;
  */
 public abstract class AbstractProviderModule implements ProviderModule, ResourceProviderObserver, JMXHostProvider, GangliaHostProvider {
 
-  private static final String HOST_CLUSTER_NAME_PROPERTY_ID             = PropertyHelper.getPropertyId("Hosts", "cluster_name");
-  private static final String HOST_NAME_PROPERTY_ID                     = PropertyHelper.getPropertyId("Hosts", "host_name");
-  private static final String HOST_IP_PROPERTY_ID                       = PropertyHelper.getPropertyId("Hosts", "ip");
   private static final String CLUSTER_NAME_PROPERTY_ID                  = PropertyHelper.getPropertyId("Clusters", "cluster_name");
   private static final String HOST_COMPONENT_CLUSTER_NAME_PROPERTY_ID   = PropertyHelper.getPropertyId("HostRoles", "cluster_name");
   private static final String HOST_COMPONENT_HOST_NAME_PROPERTY_ID      = PropertyHelper.getPropertyId("HostRoles", "host_name");
   private static final String HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("HostRoles", "component_name");
   private static final String GANGLIA_SERVER                            = "GANGLIA_SERVER";
-  private static final String GANGLIA_MONITOR                           = "GANGLIA_MONITOR";
-  private static final String GANGLIA_SERVER_OLD                        = "GANGLIA_MONITOR_SERVER";
 
   /**
    * The map of resource providers.
@@ -71,10 +66,8 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
   private AmbariManagementController managementController;
 
   /**
-   * The map of hosts.
+   * The map of host components.
    */
-  private Map<String, Map<String, String>> clusterHostMap;
-
   private Map<String, Map<String, String>> clusterHostComponentMap;
 
   /**
@@ -142,12 +135,6 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
     return clusterHostComponentMap.get(clusterName).get(componentName);
   }
 
-  @Override
-  public Map<String, String> getHostMapping(String clusterName) throws SystemException {
-    checkInit();
-    return clusterHostMap.get(clusterName);
-  }
-
 
   // ----- GangliaHostProvider -----------------------------------------------
 
@@ -268,7 +255,6 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
     try {
       Set<Resource> clusters = provider.getResources(request, null);
 
-      clusterHostMap             = new HashMap<String, Map<String, String>>();
       clusterHostComponentMap    = new HashMap<String, Map<String, String>>();
       clusterGangliaCollectorMap = new HashMap<String, String>();
 
@@ -276,34 +262,13 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
 
         String clusterName = (String) cluster.getPropertyValue(CLUSTER_NAME_PROPERTY_ID);
 
-        // initialize the host map from the known hosts...
-        provider = getResourceProvider(Resource.Type.Host);
-        request  = PropertyHelper.getReadRequest(HOST_NAME_PROPERTY_ID, HOST_IP_PROPERTY_ID);
-
-        Predicate predicate   = new PredicateBuilder().property(HOST_CLUSTER_NAME_PROPERTY_ID).
-            equals(clusterName).toPredicate();
-
-        Set<Resource>       hosts   = provider.getResources(request, predicate);
-        Map<String, String> hostMap = clusterHostMap.get(clusterName);
-
-        if (hostMap == null) {
-          hostMap = new HashMap<String, String>();
-          clusterHostMap.put(clusterName, hostMap);
-        }
-
-        for (Resource host : hosts) {
-          String hostName = (String) host.getPropertyValue(HOST_NAME_PROPERTY_ID);
-          String hostIp   = (String) host.getPropertyValue(HOST_IP_PROPERTY_ID);
-          hostMap.put(hostName, hostIp == null ? hostName : hostIp);
-        }
-
         // initialize the host component map and Ganglia server from the known hosts components...
         provider = getResourceProvider(Resource.Type.HostComponent);
 
         request = PropertyHelper.getReadRequest(HOST_COMPONENT_HOST_NAME_PROPERTY_ID,
             HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID);
 
-        predicate = new PredicateBuilder().property(HOST_COMPONENT_CLUSTER_NAME_PROPERTY_ID).
+        Predicate predicate = new PredicateBuilder().property(HOST_COMPONENT_CLUSTER_NAME_PROPERTY_ID).
             equals(clusterName).toPredicate();
 
         Set<Resource>       hostComponents   = provider.getResources(request, predicate);
@@ -318,11 +283,11 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
           String componentName = (String) hostComponent.getPropertyValue(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID);
           String hostName      = (String) hostComponent.getPropertyValue(HOST_COMPONENT_HOST_NAME_PROPERTY_ID);
 
-          hostComponentMap.put(componentName, hostMap.get(hostName));
+          hostComponentMap.put(componentName, hostName);
 
           // record the Ganglia server for the current cluster
-          if (componentName.equals(GANGLIA_SERVER) || componentName.equals(GANGLIA_MONITOR) ||componentName.equals(GANGLIA_SERVER_OLD)) {
-            clusterGangliaCollectorMap.put(clusterName, clusterHostMap.get(clusterName).get(hostName));
+          if (componentName.equals(GANGLIA_SERVER)) {
+            clusterGangliaCollectorMap.put(clusterName, hostName);
           }
         }
       }

ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXHostProvider.java

@@ -37,16 +37,4 @@ public interface JMXHostProvider {
    * @throws SystemException of unable to ge the JMX host name
    */
   public String getHostName(String clusterName, String componentName) throws SystemException;
-
-
-  /**
-   * Get the host name mappings for the given cluster name.
-   *
-   * @param clusterName  the cluster name
-   *
-   * @return the host name mappings
-   *
-   * @throws SystemException if unable to get the host mappings
-   */
-  public Map<String, String> getHostMapping(String clusterName) throws SystemException ;
 }

ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java

@@ -159,12 +159,6 @@ public class JMXPropertyProvider implements PropertyProvider {
     }
 
     String clusterName   = (String) resource.getPropertyValue(clusterNamePropertyId);
-
-    // TODO : what should we do if the host mapping is null?
-    if (jmxHostProvider.getHostMapping(clusterName) == null) {
-      return true;
-    }
-
     String componentName = (String) resource.getPropertyValue(componentNamePropertyId);
     String port          = JMX_PORTS.get(componentName);
 
@@ -173,8 +167,7 @@ public class JMXPropertyProvider implements PropertyProvider {
       hostName = jmxHostProvider.getHostName(clusterName, componentName);
     }
     else {
-      String name = (String) resource.getPropertyValue(hostNamePropertyId);
-      hostName = jmxHostProvider.getHostMapping(clusterName).get(name);
+      hostName = (String) resource.getPropertyValue(hostNamePropertyId);
     }
 
     Map<String, PropertyInfo> metrics = componentMetrics.get(componentName);
@@ -247,8 +240,8 @@ public class JMXPropertyProvider implements PropertyProvider {
         }
       }
     } catch (IOException e) {
-      if (LOG.isDebugEnabled()) {
-        LOG.debug("Caught exception getting JMX metrics : spec=" + spec, e);
+      if (LOG.isErrorEnabled()) {
+        LOG.error("Caught exception getting JMX metrics : spec=" + spec, e);
       }
     }
 

ambari-server/src/main/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-site.xml

@@ -72,7 +72,7 @@
 
   <property>
     <name>mapred.system.dir</name>
-    <value>/mapred/system</value>
+    <value></value>
     <description>No description</description>
     <final>true</final>
   </property>

ambari-server/src/test/java/org/apache/ambari/server/api/handlers/DelegatingRequestHandlerTest.java

@@ -1,124 +0,0 @@
-package org.apache.ambari.server.api.handlers;
-
-import org.apache.ambari.server.api.services.Request;
-import org.apache.ambari.server.api.services.Result;
-import org.apache.ambari.server.api.services.ResultPostProcessor;
-import org.junit.Test;
-
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.assertSame;
-
-/**
- * Created with IntelliJ IDEA.
- * User: john
- * Date: 9/12/12
- * Time: 12:06 PM
- * To change this template use File | Settings | File Templates.
- */
-public class DelegatingRequestHandlerTest {
-
-  @Test
-  public void testHandleRequest_GET() {
-    Request request = createStrictMock(Request.class);
-    RequestHandlerFactory factory = createStrictMock(RequestHandlerFactory.class);
-    RequestHandler readRequestHandler = createStrictMock(RequestHandler.class);
-    Result result = createStrictMock(Result.class);
-    ResultPostProcessor resultProcessor = createStrictMock(ResultPostProcessor.class);
-
-    // expectations
-    expect(request.getRequestType()).andReturn(Request.Type.GET);
-    expect(factory.getRequestHandler(Request.Type.GET)).andReturn(readRequestHandler);
-    expect(readRequestHandler.handleRequest(request)).andReturn(result);
-    expect(request.getResultPostProcessor()).andReturn(resultProcessor);
-    resultProcessor.process(result);
-
-    replay(request, factory, readRequestHandler, result, resultProcessor);
-
-    RequestHandler delegatingRequestHandler = new TestDelegatingRequestHandler(factory);
-
-    assertSame(result, delegatingRequestHandler.handleRequest(request));
-    verify(request, factory, readRequestHandler, result, resultProcessor);
-  }
-
-  @Test
-  public void testHandleRequest_PUT() {
-    Request request = createStrictMock(Request.class);
-    RequestHandlerFactory factory = createStrictMock(RequestHandlerFactory.class);
-    RequestHandler requestHandler = createStrictMock(RequestHandler.class);
-    Result result = createStrictMock(Result.class);
-    ResultPostProcessor resultProcessor = createStrictMock(ResultPostProcessor.class);
-
-    // expectations
-    expect(request.getRequestType()).andReturn(Request.Type.POST);
-    expect(factory.getRequestHandler(Request.Type.POST)).andReturn(requestHandler);
-    expect(requestHandler.handleRequest(request)).andReturn(result);
-    expect(request.getResultPostProcessor()).andReturn(resultProcessor);
-    resultProcessor.process(result);
-
-    replay(request, factory, requestHandler, result, resultProcessor);
-
-    RequestHandler delegatingRequestHandler = new TestDelegatingRequestHandler(factory);
-
-    assertSame(result, delegatingRequestHandler.handleRequest(request));
-    verify(request, factory, requestHandler, result, resultProcessor);
-  }
-
-  @Test
-  public void testHandleRequest_POST() {
-    Request request = createStrictMock(Request.class);
-    RequestHandlerFactory factory = createStrictMock(RequestHandlerFactory.class);
-    RequestHandler requestHandler = createStrictMock(RequestHandler.class);
-    Result result = createStrictMock(Result.class);
-    ResultPostProcessor resultProcessor = createStrictMock(ResultPostProcessor.class);
-
-    // expectations
-    expect(request.getRequestType()).andReturn(Request.Type.PUT);
-    expect(factory.getRequestHandler(Request.Type.PUT)).andReturn(requestHandler);
-    expect(requestHandler.handleRequest(request)).andReturn(result);
-    expect(request.getResultPostProcessor()).andReturn(resultProcessor);
-    resultProcessor.process(result);
-
-    replay(request, factory, requestHandler, result, resultProcessor);
-
-    RequestHandler delegatingRequestHandler = new TestDelegatingRequestHandler(factory);
-
-    assertSame(result, delegatingRequestHandler.handleRequest(request));
-    verify(request, factory, requestHandler, result, resultProcessor);
-  }
-
-  @Test
-  public void testHandleRequest_DELETE() {
-    Request request = createStrictMock(Request.class);
-    RequestHandlerFactory factory = createStrictMock(RequestHandlerFactory.class);
-    RequestHandler requestHandler = createStrictMock(RequestHandler.class);
-    Result result = createStrictMock(Result.class);
-    ResultPostProcessor resultProcessor = createStrictMock(ResultPostProcessor.class);
-
-    // expectations
-    expect(request.getRequestType()).andReturn(Request.Type.DELETE);
-    expect(factory.getRequestHandler(Request.Type.DELETE)).andReturn(requestHandler);
-    expect(requestHandler.handleRequest(request)).andReturn(result);
-    expect(request.getResultPostProcessor()).andReturn(resultProcessor);
-    resultProcessor.process(result);
-
-    replay(request, factory, requestHandler, result, resultProcessor);
-
-    RequestHandler delegatingRequestHandler = new TestDelegatingRequestHandler(factory);
-
-    assertSame(result, delegatingRequestHandler.handleRequest(request));
-    verify(request, factory, requestHandler, result, resultProcessor);
-  }
-
-  private class TestDelegatingRequestHandler extends DelegatingRequestHandler {
-    private RequestHandlerFactory m_factory;
-
-    private TestDelegatingRequestHandler(RequestHandlerFactory factory) {
-      m_factory = factory;
-    }
-
-    @Override
-    public RequestHandlerFactory getRequestHandlerFactory() {
-      return m_factory;
-    }
-  }
-}

ambari-server/src/test/java/org/apache/ambari/server/api/services/CreatePersistenceManagerTest.java

@@ -1,156 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ambari.server.api.services;
-
-import org.apache.ambari.server.api.resources.ResourceDefinition;
-import org.apache.ambari.server.api.resources.ResourceInstance;
-import org.apache.ambari.server.controller.internal.RequestStatusImpl;
-import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.apache.ambari.server.controller.spi.ClusterController;
-import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.server.controller.spi.Schema;
-import org.apache.ambari.server.controller.spi.Request;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import static org.junit.Assert.*;
-
-import static org.easymock.EasyMock.*;
-
-/**
- * Unit tests for CreatePersistenceManager.
- */
-public class CreatePersistenceManagerTest {
-  @Test
-  public void testPersist() throws Exception {
-    ResourceInstance resource = createMock(ResourceInstance.class);
-    ResourceDefinition resourceDefinition = createMock(ResourceDefinition.class);
-    ClusterController controller = createMock(ClusterController.class);
-    Schema schema = createMock(Schema.class);
-    String clusterId = "clusterId";
-    String serviceId = "serviceId";
-    Request serverRequest = createStrictMock(Request.class);
-
-    Map<Resource.Type, String> mapResourceIds = new HashMap<Resource.Type, String>();
-    mapResourceIds.put(Resource.Type.Cluster, "clusterId");
-    mapResourceIds.put(Resource.Type.Service, "serviceId");
-
-    Set<Map<String, Object>> setProperties = new HashSet<Map<String, Object>>();
-    Map<String, Object> mapProperties = new HashMap<String, Object>();
-    mapProperties.put(clusterId, "clusterId");
-    mapProperties.put(serviceId, "serviceId");
-    mapProperties.put(PropertyHelper.getPropertyId("foo", "bar"), "value");
-    setProperties.add(mapProperties);
-
-    //expectations
-    expect(resource.getIds()).andReturn(mapResourceIds);
-    expect(resource.getResourceDefinition()).andReturn(resourceDefinition).atLeastOnce();
-    expect(resourceDefinition.getType()).andReturn(Resource.Type.Component);
-    expect(controller.getSchema(Resource.Type.Component)).andReturn(schema);
-    expect(schema.getKeyPropertyId(Resource.Type.Cluster)).andReturn(clusterId);
-    expect(schema.getKeyPropertyId(Resource.Type.Service)).andReturn(serviceId);
-
-    expect(controller.createResources(Resource.Type.Component, serverRequest)).andReturn(new RequestStatusImpl(null));
-
-    replay(resource, resourceDefinition, controller, schema, serverRequest);
-
-    new TestCreatePersistenceManager(controller, setProperties, serverRequest).persist(resource, setProperties);
-
-    verify(resource, resourceDefinition, controller, schema, serverRequest);
-
-  }
-
-  @Test
-  public void testPersist__MultipleResources() throws Exception {
-    ResourceInstance resource = createMock(ResourceInstance.class);
-    ResourceDefinition resourceDefinition = createMock(ResourceDefinition.class);
-    ClusterController controller = createMock(ClusterController.class);
-    Schema schema = createMock(Schema.class);
-    String clusterId = "clusterId";
-    String serviceId = "serviceId";
-    Request serverRequest = createStrictMock(Request.class);
-
-    Map<Resource.Type, String> mapResourceIds = new HashMap<Resource.Type, String>();
-    mapResourceIds.put(Resource.Type.Cluster, "clusterId");
-    mapResourceIds.put(Resource.Type.Service, "serviceId");
-
-    Set<Map<String, Object>> setProperties = new HashSet<Map<String, Object>>();
-
-    Map<String, Object> mapResourceProps1 = new HashMap<String, Object>();
-    mapResourceProps1.put(clusterId, "clusterId");
-    mapResourceProps1.put(serviceId, "serviceId");
-    mapResourceProps1.put(PropertyHelper.getPropertyId("foo", "bar"), "value");
-
-    Map<String, Object> mapResourceProps2 = new HashMap<String, Object>();
-    mapResourceProps2.put(clusterId, "clusterId");
-    mapResourceProps2.put(serviceId, "serviceId2");
-    mapResourceProps2.put(PropertyHelper.getPropertyId("foo", "bar2"), "value2");
-
-    setProperties.add(mapResourceProps1);
-    setProperties.add(mapResourceProps2);
-
-    //expectations
-    expect(resource.getIds()).andReturn(mapResourceIds);
-    expect(resource.getResourceDefinition()).andReturn(resourceDefinition);
-    expect(resourceDefinition.getType()).andReturn(Resource.Type.Component);
-    expect(controller.getSchema(Resource.Type.Component)).andReturn(schema);
-    expect(schema.getKeyPropertyId(Resource.Type.Cluster)).andReturn(clusterId).times(2);
-    expect(schema.getKeyPropertyId(Resource.Type.Service)).andReturn(serviceId).times(2);
-
-    expect(controller.createResources(Resource.Type.Component, serverRequest)).andReturn(new RequestStatusImpl(null));
-
-    replay(resource, resourceDefinition, controller, schema, serverRequest);
-
-    new TestCreatePersistenceManager(controller, setProperties, serverRequest).persist(resource, setProperties);
-
-    verify(resource, resourceDefinition, controller, schema, serverRequest);
-
-  }
-
-  private class TestCreatePersistenceManager extends CreatePersistenceManager {
-
-    private ClusterController m_controller;
-    private Request m_request;
-    private Set<Map<String, Object>> m_setProperties;
-
-    private TestCreatePersistenceManager(ClusterController controller,
-                                         Set<Map<String, Object>> setProperties,
-                                         Request controllerRequest) {
-      m_controller = controller;
-      m_setProperties = setProperties;
-      m_request = controllerRequest;
-    }
-
-    @Override
-    protected ClusterController getClusterController() {
-      return m_controller;
-    }
-
-    @Override
-    protected Request createControllerRequest(Set<Map<String, Object>> setProperties) {
-      assertEquals(m_setProperties, setProperties);
-      return m_request;
-    }
-  }
-
-}

ambari-server/src/test/java/org/apache/ambari/server/api/services/DeletePersistenceManagerTest.java

@@ -1,73 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ambari.server.api.services;
-
-
-import org.apache.ambari.server.api.query.Query;
-import org.apache.ambari.server.api.resources.ResourceDefinition;
-import org.apache.ambari.server.api.resources.ResourceInstance;
-import org.apache.ambari.server.controller.internal.RequestStatusImpl;
-import org.apache.ambari.server.controller.spi.*;
-import org.junit.Test;
-
-import static org.easymock.EasyMock.*;
-
-/**
- * Unit tests for UpdatePersistenceManager.
- */
-public class DeletePersistenceManagerTest {
-  @Test
-  public void testPersist() throws Exception {
-    ResourceInstance resource = createNiceMock(ResourceInstance.class);
-    ResourceDefinition resourceDefinition = createNiceMock(ResourceDefinition.class);
-    ClusterController controller = createMock(ClusterController.class);
-    Query query = createMock(Query.class);
-    Predicate predicate = createMock(Predicate.class);
-
-    //expectations
-    expect(resource.getResourceDefinition()).andReturn(resourceDefinition).anyTimes();
-    expect(resourceDefinition.getType()).andReturn(Resource.Type.Component).anyTimes();
-    expect(resource.getQuery()).andReturn(query).anyTimes();
-    expect(query.getPredicate()).andReturn(predicate).anyTimes();
-
-    expect(controller.deleteResources(Resource.Type.Component, predicate)).andReturn(new RequestStatusImpl(null));
-
-    replay(resource, resourceDefinition, controller, query, predicate);
-
-    new TestDeletePersistenceManager(controller).persist(resource, null);
-
-    verify(resource, resourceDefinition, controller, query, predicate);
-  }
-
-
-  private class TestDeletePersistenceManager extends DeletePersistenceManager {
-
-    private ClusterController m_controller;
-
-    private TestDeletePersistenceManager(ClusterController controller) {
-      m_controller = controller;
-    }
-
-    @Override
-    protected ClusterController getClusterController() {
-      return m_controller;
-    }
-  }
-
-}

ambari-server/src/test/java/org/apache/ambari/server/api/services/RequestImplTest.java

@@ -1,134 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ambari.server.api.services;
-
-import org.apache.ambari.server.api.resources.ResourceInstance;
-import org.apache.ambari.server.controller.internal.TemporalInfoImpl;
-import org.apache.ambari.server.controller.predicate.*;
-import org.apache.ambari.server.controller.spi.Predicate;
-import org.apache.ambari.server.controller.spi.TemporalInfo;
-import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.junit.Test;
-
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriInfo;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Request tests.
- */
-public class RequestImplTest {
-
-  @Test
-  public void testGetQueryPredicate() {
-
-    String uri = "http://foo.bar.com/api/v1/clusters?foo=bar&orProp1=5|orProp2!=6|orProp3<100&prop!=5&prop2>10&prop3>=20&prop4<500&prop5<=1&fields=field1,category/field2";
-    Request request = new TestRequest(null, null, null, Request.Type.GET, null, uri);
-    Predicate predicate = request.getQueryPredicate();
-
-    Set<BasePredicate> setPredicates = new HashSet<BasePredicate>();
-    setPredicates.add(new EqualsPredicate<String>("foo", "bar"));
-
-    Set<BasePredicate> setOrPredicates = new HashSet<BasePredicate>();
-    setOrPredicates.add(new EqualsPredicate<String>("orProp1", "5"));
-    setOrPredicates.add(new NotPredicate(new EqualsPredicate<String>("orProp2", "6")));
-    setOrPredicates.add(new LessPredicate<String>("orProp3", "100"));
-    setPredicates.add(new OrPredicate(setOrPredicates.toArray(new BasePredicate[3])));
-
-    setPredicates.add(new NotPredicate(new EqualsPredicate<String>("prop", "5")));
-    setPredicates.add(new GreaterPredicate<String>("prop2", "10"));
-    setPredicates.add(new GreaterEqualsPredicate<String>("prop3", "20"));
-    setPredicates.add(new LessPredicate<String>("prop4", "500"));
-    setPredicates.add(new LessEqualsPredicate<String>("prop5", "1"));
-    Predicate expectedPredicate = new AndPredicate(setPredicates.toArray(new BasePredicate[6]));
-
-    assertEquals(expectedPredicate, predicate);
-  }
-
-  @Test
-  public void testGetFields() {
-    UriInfo uriInfo = createMock(UriInfo.class);
-    MultivaluedMap<String, String> mapQueryParams = createMock(MultivaluedMap.class);
-    String fields = "prop,category/prop1,category2/category3/prop2[1,2,3],prop3[4,5,6],category4[7,8,9],sub-resource/*[10,11,12],finalProp";
-
-    expect(uriInfo.getQueryParameters()).andReturn(mapQueryParams);
-    expect(mapQueryParams.getFirst("fields")).andReturn(fields);
-
-    replay(uriInfo, mapQueryParams);
-
-    Request request =  new TestRequest(null, null, uriInfo, Request.Type.GET, null, null);
-    Map<String, TemporalInfo> mapFields = request.getFields();
-
-    assertEquals(7, mapFields.size());
-
-    String prop = "prop";
-    assertTrue(mapFields.containsKey(prop));
-    assertNull(mapFields.get(prop));
-
-    String prop1 = PropertyHelper.getPropertyId("category", "prop1");
-    assertTrue(mapFields.containsKey(prop1));
-    assertNull(mapFields.get(prop1));
-
-    String prop2 = PropertyHelper.getPropertyId("category2/category3", "prop2");
-    assertTrue(mapFields.containsKey(prop2));
-    assertEquals(new TemporalInfoImpl(1, 2, 3), mapFields.get(prop2));
-
-    String prop3 = "prop3";
-    assertTrue(mapFields.containsKey(prop3));
-    assertEquals(new TemporalInfoImpl(4, 5, 6), mapFields.get(prop3));
-
-    String category4 = "category4";
-    assertTrue(mapFields.containsKey(category4));
-    assertEquals(new TemporalInfoImpl(7, 8, 9), mapFields.get(category4));
-
-    String subResource = PropertyHelper.getPropertyId("sub-resource", "*");
-    assertTrue(mapFields.containsKey(subResource));
-    assertEquals(new TemporalInfoImpl(10, 11, 12), mapFields.get(subResource));
-
-    String finalProp = "finalProp";
-    assertTrue(mapFields.containsKey(finalProp));
-    assertNull(mapFields.get(finalProp));
-
-
-    verify(uriInfo, mapQueryParams);
-  }
-
-
-  private class TestRequest extends RequestImpl {
-    private String m_uri;
-    private TestRequest(HttpHeaders headers, String body, UriInfo uriInfo, Type requestType,
-                        ResourceInstance resource, String uri) {
-
-      super(headers, body, uriInfo, requestType, resource);
-      m_uri = uri;
-    }
-
-    @Override
-    public String getURI() {
-      return m_uri;
-    }
-  }
-}

ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java

@@ -68,7 +68,7 @@ public class GangliaPropertyProviderTest {
 
     Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size());
 
-    Assert.assertEquals("http://ec2-23-23-71-42.compute-1.amazonaws.com/cgi-bin/rrd.py?c=HDPSlaves&h=domU-12-31-39-0E-34-E1.compute-1.internal&m=jvm.metrics.gcCount&s=10&e=20&r=1",
+    Assert.assertEquals("http://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPSlaves&h=domU-12-31-39-0E-34-E1.compute-1.internal&m=jvm.metrics.gcCount&s=10&e=20&r=1",
         streamProvider.getLastSpec());
 
     Assert.assertEquals(3, PropertyHelper.getProperties(resource).size());
@@ -110,7 +110,7 @@ public class GangliaPropertyProviderTest {
 
     Assert.assertEquals(3, propertyProvider.populateResources(resources, request, null).size());
 
-    Assert.assertEquals("http://ec2-23-23-71-42.compute-1.amazonaws.com/cgi-bin/rrd.py?c=HDPSlaves&h=domU-12-31-39-0E-34-E3.compute-1.internal,domU-12-31-39-0E-34-E1.compute-1.internal,domU-12-31-39-0E-34-E2.compute-1.internal&m=jvm.metrics.gcCount&s=10&e=20&r=1",
+    Assert.assertEquals("http://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPSlaves&h=domU-12-31-39-0E-34-E3.compute-1.internal,domU-12-31-39-0E-34-E1.compute-1.internal,domU-12-31-39-0E-34-E2.compute-1.internal&m=jvm.metrics.gcCount&s=10&e=20&r=1",
         streamProvider.getLastSpec());
 
     for (Resource res : resources) {
@@ -123,7 +123,7 @@ public class GangliaPropertyProviderTest {
 
     @Override
     public String getGangliaCollectorHostName(String clusterName) {
-      return "ec2-23-23-71-42.compute-1.amazonaws.com";
+      return "domU-12-31-39-0E-34-E1.compute-1.internal";
     }
   }
 }

ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TestProviderModule.java

@@ -19,7 +19,6 @@
 package org.apache.ambari.server.controller.internal;
 
 import org.apache.ambari.server.controller.jdbc.TestJDBCResourceProvider;
-import org.apache.ambari.server.controller.jmx.TestHostMappingProvider;
 import org.apache.ambari.server.controller.spi.PropertyProvider;
 import org.apache.ambari.server.controller.spi.ProviderModule;
 import org.apache.ambari.server.controller.spi.Resource;
@@ -56,33 +55,9 @@ public class TestProviderModule implements ProviderModule {
 
     List<PropertyProvider> providers = new LinkedList<PropertyProvider>();
 
-//    PropertyProvider propertyProvider = new GangliaPropertyProvider(
-//        PropertyHelper.getGangliaPropertyIds(Resource.Type.Component),
-//        new org.apache.ambari.server.controller.ganglia.TestStreamProvider(),
-//        "ec2-23-23-71-42.compute-1.amazonaws.com",
-//        null, null,
-//        PropertyHelper.getPropertyId("component_name", "ServiceComponentInfo"));
-//    providers.add(propertyProvider);
-
     propertyProviders.put(Resource.Type.Component, providers);
 
     providers = new LinkedList<PropertyProvider>();
-    Map<String, String> hostMap = TestHostMappingProvider.getHostMap();
-
-//    PropertyProvider propertyProvider = new JMXPropertyProvider(
-//        PropertyHelper.getJMXPropertyIds(Resource.Type.HostComponent),
-//        new org.apache.ambari.server.controller.jmx.TestStreamProvider(),
-//        hostMap);
-//    providers.add(propertyProvider);
-
-
-//    propertyProvider = new GangliaPropertyProvider(
-//        PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent),
-//        new org.apache.ambari.server.controller.ganglia.TestStreamProvider(),
-//        "ec2-23-23-71-42.compute-1.amazonaws.com",
-//        null, PropertyHelper.getPropertyId("host_name", "HostRoles"),
-//        PropertyHelper.getPropertyId("component_name", "HostRoles"));
-//    providers.add(propertyProvider);
 
     propertyProviders.put(Resource.Type.HostComponent, providers);
   }

ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java

@@ -26,7 +26,6 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.Collections;
-import java.util.Map;
 
 /**
  * JMX property provider tests.
@@ -58,7 +57,7 @@ public class JMXPropertyProviderTest {
 
     Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size());
 
-    Assert.assertEquals(propertyProvider.getSpec("ec2-50-17-129-192.compute-1.amazonaws.com:50070"), streamProvider.getLastSpec());
+    Assert.assertEquals(propertyProvider.getSpec("domu-12-31-39-0e-34-e1.compute-1.internal:50070"), streamProvider.getLastSpec());
 
     // see test/resources/hdfs_namenode_jmx.json for values
     Assert.assertEquals(1084287,  resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "ReceivedBytes")));
@@ -77,7 +76,7 @@ public class JMXPropertyProviderTest {
 
     propertyProvider.populateResources(Collections.singleton(resource), request, null);
 
-    Assert.assertEquals(propertyProvider.getSpec("ec2-23-23-71-42.compute-1.amazonaws.com:50075"), streamProvider.getLastSpec());
+    Assert.assertEquals(propertyProvider.getSpec("domu-12-31-39-14-ee-b3.compute-1.internal:50075"), streamProvider.getLastSpec());
 
     // see test/resources/hdfs_datanode_jmx.json for values
     Assert.assertEquals(0,  resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "ReceivedBytes")));
@@ -95,7 +94,7 @@ public class JMXPropertyProviderTest {
 
     propertyProvider.populateResources(Collections.singleton(resource), request, null);
 
-    Assert.assertEquals(propertyProvider.getSpec("ec2-23-23-71-42.compute-1.amazonaws.com:50030"), streamProvider.getLastSpec());
+    Assert.assertEquals(propertyProvider.getSpec("domu-12-31-39-14-ee-b3.compute-1.internal:50030"), streamProvider.getLastSpec());
 
     // see test/resources/mapreduce_jobtracker_jmx.json for values
     // resource should now contain 3 properties... host name, component name, and jvm.threadsWaiting (from request)
@@ -104,17 +103,10 @@ public class JMXPropertyProviderTest {
     Assert.assertNull(resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "gcCount")));
   }
 
-
-
   private static class TestJMXHostProvider implements JMXHostProvider {
     @Override
     public String getHostName(String clusterName, String componentName) {
       return null;
     }
-
-    @Override
-    public Map<String, String> getHostMapping(String clusterName) {
-      return TestHostMappingProvider.getHostMap();
-    }
   }
 }

ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/TestHostMappingProvider.java

@@ -1,41 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ambari.server.controller.jmx;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- */
-public class TestHostMappingProvider {
-
-  private static Map<String, String> HOST_MAPPING = new HashMap<String, String>();
-
-  static {
-    HOST_MAPPING.put("domu-12-31-39-0e-34-e1.compute-1.internal", "ec2-50-17-129-192.compute-1.amazonaws.com");
-    HOST_MAPPING.put("ip-10-190-186-15.ec2.internal",             "ec2-23-21-8-226.compute-1.amazonaws.com");
-    HOST_MAPPING.put("domu-12-31-39-14-ee-b3.compute-1.internal", "ec2-23-23-71-42.compute-1.amazonaws.com");
-    HOST_MAPPING.put("ip-10-110-157-51.ec2.internal",             "ec2-107-22-121-67.compute-1.amazonaws.com");
-  }
-
-  public static Map<String, String> getHostMap() {
-    return HOST_MAPPING;
-  }
-}

ambari.iml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-

contrib/ambari-log4j/.classpath

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
-  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
-  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.2.7/jaxb-api-2.2.7.jar"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/hadoop/hadoop-tools/1.1.1.1/hadoop-tools-1.1.1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/hadoop/hadoop-core/1.1.1.1/hadoop-core-1.1.1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xmlenc/xmlenc/0.52/xmlenc-0.52.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/2.1/commons-io-2.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-math/2.1/commons-math-2.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-net/commons-net/1.4.1/commons-net-1.4.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar"/>
-  <classpathentry kind="var" path="M2_REPO/tomcat/jasper-runtime/5.5.12/jasper-runtime-5.5.12.jar"/>
-  <classpathentry kind="var" path="M2_REPO/tomcat/jasper-compiler/5.5.12/jasper-compiler-5.5.12.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-api-2.1/6.1.14/jsp-api-2.1-6.1.14.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1.14/servlet-api-2.5-6.1.14.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-2.1/6.1.14/jsp-2.1-6.1.14.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.1.1/core-3.1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/net/java/dev/jets3t/jets3t/0.6.1/jets3t-0.6.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.10/hsqldb-1.8.0.10.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.9.2/jackson-mapper-asl-1.9.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.9.2/jackson-core-asl-1.9.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.15/log4j-1.2.15.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/postgresql/postgresql/9.1-901-1.jdbc4/postgresql-9.1-901-1.jdbc4.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-json/1.13/jersey-json-1.13.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.1/jettison-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.3-1/jaxb-impl-2.2.3-1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-jaxrs/1.9.2/jackson-jaxrs-1.9.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-xc/1.9.2/jackson-xc-1.9.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-core/1.13/jersey-core-1.13.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-servlet/1.13/jersey-servlet-1.13.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-server/1.13/jersey-server-1.13.jar"/>
-  <classpathentry kind="var" path="M2_REPO/asm/asm/3.1/asm-3.1.jar"/>
-</classpath>

contrib/ambari-log4j/.project

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-  <name>ambari-log4j</name>
-  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>

pom.xml

@@ -115,7 +115,6 @@
           <excludes>
             <exclude>**/*.json</exclude>
             <exclude>derby.log</exclude>
-            <exclude>CHANGES.txt</exclude>
             <exclude>AMBARI-666-CHANGES.txt</exclude>
             <exclude>pass.txt</exclude>
             <exclude>contrib/addons/test/dataServices/jmx/data/cluster_configuration.json.nohbase</exclude>