ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [1/5] ambari git commit: AMBARI-9534 AMS Service Rename (mpapirkovskyy via dsen)
Date Tue, 10 Feb 2015 11:25:50 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 43352a755 -> 4eccfbc43


http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml
new file mode 100644
index 0000000..fcfdc24
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+  ~ 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.
+  -->
+
+<configuration supports_final="false">
+
+  <property>
+    <name>content</name>
+    <description>Custom log4j.properties</description>
+    <value>
+      #
+      # 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.
+      #
+
+      # Define some default values that can be overridden by system properties
+      # Root logger option
+      log4j.rootLogger=INFO,file
+
+      # Direct log messages to a log file
+      log4j.appender.file=org.apache.log4j.RollingFileAppender
+      log4j.appender.file.File=C:\\var\\log\\ambari-metrics-collector\\ambari-metrics-collector.log
+      log4j.appender.file.MaxFileSize=80MB
+      log4j.appender.file.MaxBackupIndex=60
+      log4j.appender.file.layout=org.apache.log4j.PatternLayout
+      log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p [%t] %c{1}:%L - %m%n
+    </value>
+  </property>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-site.xml
new file mode 100644
index 0000000..097de9d
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-site.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ *
+ * 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.
+ */
+-->
+<configuration>
+  <property>
+    <name>timeline.metrics.aggregator.checkpoint.dir</name>
+    <value>c:\ambari\ambari-metrics-collector\checkpoint</value>
+    <description>
+      Directory to store aggregator checkpoints. Change to a permanent
+      location so that checkpoint ar not lost.
+    </description>
+  </property>
+</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/metainfo.xml
new file mode 100644
index 0000000..c97ab1e
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/metainfo.xml
@@ -0,0 +1,26 @@
+<?xml version="1.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.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>AMBARI_METRICS</name>
+      <extends>common-services/AMBARI_METRICS/0.1.0</extends>
+    </service>
+  </services>
+</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-env.xml
deleted file mode 100644
index 3b421b9..0000000
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-env.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-  ~ 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.
-  -->
-
-<configuration>
-  <property>
-    <name>ams_user</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>content</name>
-    <value>
-    </value>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-hbase-env.xml
deleted file mode 100644
index ae2aa9a..0000000
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-hbase-env.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * 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.
- */
--->
-
-<configuration>
-  <property>
-    <name>hbase_log_dir</name>
-    <value>c:\hadoop\logs\ams-hbase</value>
-    <description>Log Directories for HBase.</description>
-  </property>
-  <property>
-    <name>hbase_pid_dir</name>
-    <value>c:\hadoop\run\ams-hbase</value>
-    <description>Pid Directory for HBase.</description>
-  </property>
-  <property>
-    <name>hbase_user</name>
-    <deleted>true</deleted>
-  </property>
-
-  <!-- hbase-env.cmd -->
-  <property>
-    <name>content</name>
-    <description>This is the jinja template for hbase-env.cmd file</description>
-    <value>
-    </value>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-hbase-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-hbase-site.xml
deleted file mode 100644
index 414f73d..0000000
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-hbase-site.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- *
- * 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.
- */
--->
-<configuration>
-  <property>
-    <name>hbase.rootdir</name>
-    <value>file:///C:/hadoop/hbase-ams</value>
-    <description>
-      AMS service uses HBase as default storage backend. Set the rootdir for
-      HBase to either local filesystem path if using AMS in embedded mode or
-      to a HDFS dir, example: hdfs://namenode.example.org:9000/hbase.  By
-      default HBase writes into /tmp. Change this configuration else all data
-      will be lost on machine restart.
-    </description>
-  </property>
-  <property>
-    <name>hbase.tmp.dir</name>
-    <value>c:/hadoop/hbase-ams/hbase-tmp</value>
-    <description>
-      Temporary directory on the local filesystem.
-      Change this setting to point to a location more permanent
-      than '/tmp' (The '/tmp' directory is often cleared on
-      machine restart).
-    </description>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-log4j.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-log4j.xml
deleted file mode 100644
index fcfdc24..0000000
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-log4j.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-  ~ 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.
-  -->
-
-<configuration supports_final="false">
-
-  <property>
-    <name>content</name>
-    <description>Custom log4j.properties</description>
-    <value>
-      #
-      # 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.
-      #
-
-      # Define some default values that can be overridden by system properties
-      # Root logger option
-      log4j.rootLogger=INFO,file
-
-      # Direct log messages to a log file
-      log4j.appender.file=org.apache.log4j.RollingFileAppender
-      log4j.appender.file.File=C:\\var\\log\\ambari-metrics-collector\\ambari-metrics-collector.log
-      log4j.appender.file.MaxFileSize=80MB
-      log4j.appender.file.MaxBackupIndex=60
-      log4j.appender.file.layout=org.apache.log4j.PatternLayout
-      log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p [%t] %c{1}:%L - %m%n
-    </value>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-site.xml
deleted file mode 100644
index 097de9d..0000000
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-site.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- *
- * 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.
- */
--->
-<configuration>
-  <property>
-    <name>timeline.metrics.aggregator.checkpoint.dir</name>
-    <value>c:\ambari\ambari-metrics-collector\checkpoint</value>
-    <description>
-      Directory to store aggregator checkpoints. Change to a permanent
-      location so that checkpoint ar not lost.
-    </description>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/metainfo.xml
deleted file mode 100644
index f0fa469..0000000
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/metainfo.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.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.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>AMS</name>
-      <extends>common-services/AMS/0.1.0</extends>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/AMBARI_METRICS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/AMBARI_METRICS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/AMBARI_METRICS/metainfo.xml
new file mode 100644
index 0000000..142cf67
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/AMBARI_METRICS/metainfo.xml
@@ -0,0 +1,26 @@
+<?xml version="1.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.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>AMBARI_METRICS</name>
+      <version>0.1.0</version>
+    </service>
+  </services>
+</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/AMS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/AMS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/AMS/metainfo.xml
deleted file mode 100644
index c57f6be..0000000
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/AMS/metainfo.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.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.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>AMS</name>
-      <version>0.1.0</version>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MetricsServiceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MetricsServiceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MetricsServiceProviderTest.java
index 9e4131f..b15201b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MetricsServiceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MetricsServiceProviderTest.java
@@ -76,7 +76,7 @@ public class MetricsServiceProviderTest {
     Predicate expectedPredicate2 =
       new PredicateBuilder().property(HOST_COMPONENT_CLUSTER_NAME_PROPERTY_ID)
         .equals("c1").and().property(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID)
-        .equals("METRIC_COLLECTOR").toPredicate();
+        .equals("METRICS_COLLECTOR").toPredicate();
 
     ArgumentCaptor<Request> requestCapture = ArgumentCaptor.forClass(Request.class);
     ArgumentCaptor<Predicate> predicateCapture = ArgumentCaptor.forClass(Predicate.class);
@@ -111,7 +111,7 @@ public class MetricsServiceProviderTest {
     when(hostComponentResourceProvider.getResources(any(Request.class),
       any(Predicate.class))).thenReturn(hostComponents);
     when(hostComponent.getPropertyValue
-      (HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID)).thenReturn("METRIC_COLLECTOR");
+      (HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID)).thenReturn("METRICS_COLLECTOR");
     when(hostComponent.getPropertyValue(HOST_COMPONENT_HOST_NAME_PROPERTY_ID)).thenReturn("h1");
 
     service = providerModule.getMetricsServiceType();

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java
index 321e209..d8e0b65 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java
@@ -348,7 +348,7 @@ public class AMSPropertyProviderTest {
     String propertyId = PropertyHelper.getPropertyId("metrics/hbase/regionserver", "requests");
     Resource resource = new ResourceImpl(Resource.Type.Component);
     resource.setProperty(HOST_NAME_PROPERTY_ID, "h1");
-    resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "METRIC_COLLECTOR");
+    resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "METRICS_COLLECTOR");
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
     temporalInfoMap.put(propertyId, new TemporalInfoImpl(1421694000L, 1421697600L, 1L));
     Request request = PropertyHelper.getReadRequest(

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index ba6cd8c..c5beeb3 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -651,10 +651,10 @@ class TestHDP22StackAdvisor(TestCase):
     services = {
       "services":  [ {
         "StackServices": {
-          "service_name": "AMS"
+          "service_name": "AMBARI_METRICS"
         },"components": [{
           "StackServiceComponents": {
-            "component_name": "METRIC_COLLECTOR",
+            "component_name": "METRICS_COLLECTOR",
             "hostnames": ["host1"]
           }
 
@@ -830,4 +830,4 @@ class TestHDP22StackAdvisor(TestCase):
                      'level': 'WARN'}]
 
     res = self.stackAdvisor.validateMapReduce2Configurations(properties, recommendedDefaults, {}, '', '')
-    self.assertEquals(res, res_expected)
\ No newline at end of file
+    self.assertEquals(res, res_expected)

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-shell/ambari-groovy-shell/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-shell/ambari-groovy-shell/pom.xml b/ambari-shell/ambari-groovy-shell/pom.xml
index 6739137..973a104 100644
--- a/ambari-shell/ambari-groovy-shell/pom.xml
+++ b/ambari-shell/ambari-groovy-shell/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-shell</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
     <relativePath>../../ambari-shell</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
   <artifactId>ambari-groovy-shell</artifactId>
   <packaging>jar</packaging>
   <name>Ambari Groovy Shell</name>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <description>Ambari Groovy Shell</description>
    <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>groovy-client</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>2.0.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-shell/ambari-python-shell/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-shell/ambari-python-shell/pom.xml b/ambari-shell/ambari-python-shell/pom.xml
index 4381e1b..ad78f53 100644
--- a/ambari-shell/ambari-python-shell/pom.xml
+++ b/ambari-shell/ambari-python-shell/pom.xml
@@ -19,14 +19,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-shell</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
     <relativePath>../../ambari-shell</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-python-shell</artifactId>
   <packaging>pom</packaging>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <name>Ambari Python Shell</name>
   <description>Ambari Python Shell</description>
   <properties>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-shell/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-shell/pom.xml b/ambari-shell/pom.xml
index b23602e..9dd8825 100644
--- a/ambari-shell/pom.xml
+++ b/ambari-shell/pom.xml
@@ -21,14 +21,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-shell</artifactId>
   <packaging>pom</packaging>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <name>Ambari Shell</name>
   <description>Ambari Shell</description>
   <modules>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-views/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-views/pom.xml b/ambari-views/pom.xml
index cecf8a1..db710e4 100644
--- a/ambari-views/pom.xml
+++ b/ambari-views/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.ambari</groupId>
         <artifactId>ambari-project</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>2.0.0.0</version>
         <relativePath>../ambari-project</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -28,7 +28,7 @@
     <artifactId>ambari-views</artifactId>
     <packaging>jar</packaging>
     <name>Ambari Views</name>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
     <description>Ambari View interfaces.</description>
     <url>http://ambari.apache.org/</url>
     <scm>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-web/app/controllers/wizard/step4_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step4_controller.js b/ambari-web/app/controllers/wizard/step4_controller.js
index bc433ce..c4b19a3 100644
--- a/ambari-web/app/controllers/wizard/step4_controller.js
+++ b/ambari-web/app/controllers/wizard/step4_controller.js
@@ -82,8 +82,7 @@ App.WizardStep4Controller = Em.ArrayController.extend({
    * @method ambariMetricsValidation
    */
   ambariMetricsValidation: function () {
-    //TODO Change 'AMS' to the actual serviceName after it's changed
-    var ambariMetricsService = this.findProperty('serviceName', 'AMS');
+    var ambariMetricsService = this.findProperty('serviceName', 'AMBARI_METRICS');
     if (ambariMetricsService && !ambariMetricsService.get('isSelected')) {
       this.addValidationError({
         id: 'ambariMetricsCheck',

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 5eb7f22..2b2294c 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -4180,7 +4180,7 @@ var hdp2properties = [
     "rowStyleClass": "indent-1",
     "filename": "alert_notification"
   },
-/************************************************AMS******************************************/
+/************************************************AMBARI_METRICS******************************************/
   {
     "id": "site property",
     "name": "timeline.metrics.service.operation.mode",
@@ -4188,55 +4188,55 @@ var hdp2properties = [
     "description": "\n      Service Operation modes:\n      1) embedded: Metrics stored on local FS, HBase in Standalone mode\n      2) distributed: HBase daemons writing to HDFS\n      3) external: External HBase storage backend\n    ",
     "defaultValue": "embedded",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "General",
     "index": 1
   },
   {
     "id": "site property",
-    "name": "ams_collector_log_dir",
+    "name": "metrics_collector_log_dir",
     "displayName": "Metrics Collector log dir",
     "description": "\n      Log location for collector logs\n    ",
     "defaultValue": "embedded",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-env.xml",
     "category": "General",
     "index": 2
   },
   {
     "id": "site property",
-    "name": "ams_collector_pid_dir",
+    "name": "metrics_collector_pid_dir",
     "displayName": "Metrics Collector pid dir",
     "description": "\n      pid location for collector\n    ",
     "defaultValue": "embedded",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-env.xml",
     "category": "General",
     "index": 3
   },
   {
     "id": "site property",
-    "name": "ams_monitor_log_dir",
+    "name": "metrics_monitor_log_dir",
     "displayName": "Metrics Monitor log dir",
     "description": "\n      Log location for monitor logs\n    ",
     "defaultValue": "embedded",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-env.xml",
     "category": "General",
     "index": 4
   },
   {
     "id": "site property",
-    "name": "ams_monitor_pid_dir",
+    "name": "metrics_monitor_pid_dir",
     "displayName": "Metrics Monitor pid dir",
     "description": "\n      pid location for monitor\n    ",
     "defaultValue": "embedded",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-env.xml",
     "category": "General",
     "index": 5
@@ -4248,7 +4248,7 @@ var hdp2properties = [
     "description": "\n      Directory to store aggregator checkpoints\n    ",
     "defaultValue": "/tmp",
     "displayType": "directory",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 17
@@ -4260,7 +4260,7 @@ var hdp2properties = [
     "description": "\n      Multiplier value * interval = Max allowed checkpoint lag. Effectively\n      if aggregator checkpoint is greater than max allowed checkpoint delay,\n      the checkpoint will be discarded by the aggregator.\n    ",
     "defaultValue": "2",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 16
@@ -4272,7 +4272,7 @@ var hdp2properties = [
     "description": "\n      Disable cluster based hourly aggregations.\n    ",
     "defaultValue": "false",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 14
@@ -4284,7 +4284,7 @@ var hdp2properties = [
     "description": "\n      Time in seconds to sleep for the hourly resolution cluster wide\n      aggregator. Default is 1 hour.\n    ",
     "defaultValue": "3600",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 15
@@ -4296,7 +4296,7 @@ var hdp2properties = [
     "description": "\n      Multiplier value * interval = Max allowed checkpoint lag. Effectively\n      if aggregator checkpoint is greater than max allowed checkpoint delay,\n      the checkpoint will be discarded by the aggregator.\n    ",
     "defaultValue": "2",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 13
@@ -4308,7 +4308,7 @@ var hdp2properties = [
     "description": "\n      Disable cluster based minute aggregations.\n    ",
     "defaultValue": "false",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 10
@@ -4320,7 +4320,7 @@ var hdp2properties = [
     "description": "\n      Time in seconds to sleep for the minute resolution cluster wide\n      aggregator. Default resolution is 2 minutes.\n    ",
     "defaultValue": "120",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 11
@@ -4332,7 +4332,7 @@ var hdp2properties = [
     "description": "\n      Lowest resolution of desired data for cluster level minute aggregates.\n    ",
     "defaultValue": "15",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 12
@@ -4344,7 +4344,7 @@ var hdp2properties = [
     "description": "\n      Multiplier value * interval = Max allowed checkpoint lag. Effectively\n      if aggregator checkpoint is greater than max allowed checkpoint delay,\n      the checkpoint will be discarded by the aggregator.\n    ",
     "defaultValue": "2",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 9
@@ -4356,7 +4356,7 @@ var hdp2properties = [
     "description": "\n      Disable host based hourly aggregations\n    ",
     "defaultValue": "false",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 7
@@ -4368,7 +4368,7 @@ var hdp2properties = [
     "description": "\n      Time in seconds to sleep for the hourly resolution host based\n      aggregator. Default resolution is 1 hour.\n    ",
     "defaultValue": "3600",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 8
@@ -4380,7 +4380,7 @@ var hdp2properties = [
     "description": "\n      Multiplier value * interval = Max allowed checkpoint lag. Effectively\n      if aggregator checkpoint is greater than max allowed checkpoint delay,\n      the checkpoint will be discarded by the aggregator.\n    ",
     "defaultValue": "2",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 6
@@ -4392,7 +4392,7 @@ var hdp2properties = [
     "description": "\n      Disable host based minute aggregations.\n    ",
     "defaultValue": "false",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 4
@@ -4404,7 +4404,7 @@ var hdp2properties = [
     "description": "\n      Time in seconds to sleep for the minute resolution host based\n      aggregator. Default resolution is 5 minutes.\n    ",
     "defaultValue": "300",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 5
@@ -4416,7 +4416,7 @@ var hdp2properties = [
     "description": "\n      Time in seconds to sleep on the first run or when the checkpoint is\n      too old.\n    ",
     "defaultValue": "120",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 1
@@ -4428,7 +4428,7 @@ var hdp2properties = [
     "description": "\n      Max result limit on number of rows returned. Calculated as follows:\n      4 aggregate metrics/min * 60 * 24: Retrieve aggregate data for 1 day.\n    ",
     "defaultValue": "5760",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 2
@@ -4440,7 +4440,7 @@ var hdp2properties = [
     "description": "\n      JDBC resultset prefect size for aggregator queries.\n    ",
     "defaultValue": "2000",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 3

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-web/app/models/stack_service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js
index ad1236f..c950e48 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -319,7 +319,7 @@ App.StackService.configCategories = function () {
         App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'})
       ]);
       break;
-    case 'AMS':
+    case 'AMBARI_METRICS':
       serviceConfigCategories.pushObjects([
         App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'}),
         App.ServiceConfigCategory.create({ name: 'MetricCollector', displayName: 'Metric Collector'})

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-web/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml
index db6951e..39628bb 100644
--- a/ambari-web/pom.xml
+++ b/ambari-web/pom.xml
@@ -20,14 +20,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-web</artifactId>
   <packaging>pom</packaging>
   <name>Ambari Web</name>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <description>Ambari Web</description>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-web/test/controllers/wizard/step4_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step4_test.js b/ambari-web/test/controllers/wizard/step4_test.js
index 3e85a04..00965c8 100644
--- a/ambari-web/test/controllers/wizard/step4_test.js
+++ b/ambari-web/test/controllers/wizard/step4_test.js
@@ -25,7 +25,7 @@ describe('App.WizardStep4Controller', function () {
 
   var services = [
     'HDFS', 'GANGLIA', 'OOZIE', 'HIVE', 'HBASE', 'PIG', 'SCOOP', 'ZOOKEEPER',
-    'YARN', 'MAPREDUCE2', 'FALCON', 'TEZ', 'STORM', 'AMS', 'RANGER'
+    'YARN', 'MAPREDUCE2', 'FALCON', 'TEZ', 'STORM', 'AMBARI_METRICS', 'RANGER'
   ];
 
   var controller = App.WizardStep4Controller.create();
@@ -260,35 +260,35 @@ describe('App.WizardStep4Controller', function () {
           errorsExpected: ['ambariMetricsCheck']
         },
         {
-          services: ['HDFS','ZOOKEEPER', 'AMS'],
+          services: ['HDFS','ZOOKEEPER', 'AMBARI_METRICS'],
           errorsExpected: []
         },
         {
-          services: ['ZOOKEEPER', 'AMS'],
+          services: ['ZOOKEEPER', 'AMBARI_METRICS'],
           errorsExpected: []
         },
         {
-          services: ['HDFS', 'AMS'],
+          services: ['HDFS', 'AMBARI_METRICS'],
           errorsExpected: ['serviceCheck_ZOOKEEPER']
         },
         {
-          services: ['HDFS', 'TEZ', 'ZOOKEEPER', 'AMS'],
+          services: ['HDFS', 'TEZ', 'ZOOKEEPER', 'AMBARI_METRICS'],
           errorsExpected: ['serviceCheck_YARN']
         },
         {
-          services: ['HDFS', 'ZOOKEEPER', 'FALCON', 'AMS'],
+          services: ['HDFS', 'ZOOKEEPER', 'FALCON', 'AMBARI_METRICS'],
           errorsExpected: ['serviceCheck_OOZIE']
         },
         {
-          services: ['HDFS', 'ZOOKEEPER', 'GANGLIA', 'HIVE', 'AMS'],
+          services: ['HDFS', 'ZOOKEEPER', 'GANGLIA', 'HIVE', 'AMBARI_METRICS'],
           errorsExpected: ['serviceCheck_YARN']
         },
         {
-          services: ['HDFS', 'GLUSTERFS', 'ZOOKEEPER', 'HIVE', 'AMS'],
+          services: ['HDFS', 'GLUSTERFS', 'ZOOKEEPER', 'HIVE', 'AMBARI_METRICS'],
           errorsExpected: ['serviceCheck_YARN', 'multipleDFS']
         },
         {
-          services: ['HDFS','ZOOKEEPER', 'GANGLIA', 'AMS'],
+          services: ['HDFS','ZOOKEEPER', 'GANGLIA', 'AMBARI_METRICS'],
           errorsExpected: []
         },
         {
@@ -530,13 +530,13 @@ describe('App.WizardStep4Controller', function () {
         title: 'Ambari Metrics not available'
       },
       {
-        services: ['AMS'],
+        services: ['AMBARI_METRICS'],
         isAmbariMetricsSelected: false,
         isAmbariMetricsWarning: true,
         title: 'Ambari Metrics not selected'
       },
       {
-        services: ['AMS'],
+        services: ['AMBARI_METRICS'],
         isAmbariMetricsSelected: true,
         isAmbariMetricsWarning: false,
         title: 'Ambari Metrics selected'
@@ -547,8 +547,8 @@ describe('App.WizardStep4Controller', function () {
       it(item.title, function () {
         controller.clear();
         controller.set('content', generateSelectedServicesContent(item.services));
-        var ams = controller.findProperty('serviceName', 'AMS');
-        if (item.services.contains('AMS')) {
+        var ams = controller.findProperty('serviceName', 'AMBARI_METRICS');
+        if (item.services.contains('AMBARI_METRICS')) {
           ams.set('isSelected', item.isAmbariMetricsSelected);
         } else {
           controller.removeObject(ams);

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-web/test/controllers/wizard/step7_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step7_test.js b/ambari-web/test/controllers/wizard/step7_test.js
index 6526010..1d0bcf2 100644
--- a/ambari-web/test/controllers/wizard/step7_test.js
+++ b/ambari-web/test/controllers/wizard/step7_test.js
@@ -1322,7 +1322,7 @@ describe('App.InstallerStep7Controller', function () {
   describe('#setInstalledServiceConfigs', function () {
 
     var controller = App.WizardStep7Controller.create({
-        installedServiceNames: ['HBASE', 'AMS']
+        installedServiceNames: ['HBASE', 'AMBARI_METRICS']
       }),
       serviceConfigTags = [
         {
@@ -1348,7 +1348,7 @@ describe('App.InstallerStep7Controller', function () {
         {
           name: 'hbase.client.scanner.caching',
           value: '2000',
-          serviceName: 'AMS',
+          serviceName: 'AMBARI_METRICS',
           filename: 'ams-hbase-site.xml'
         }
       ],
@@ -1372,7 +1372,7 @@ describe('App.InstallerStep7Controller', function () {
           tag: 'version1'
         }
       ],
-      installedServiceNames = ['HBASE', 'AMS'];
+      installedServiceNames = ['HBASE', 'AMBARI_METRICS'];
 
     it('should handle properties with the same name', function () {
       controller.setInstalledServiceConfigs(serviceConfigTags, configs, configsByTags, installedServiceNames);

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-web/test/mock_data_setup/configs_mock_data.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/mock_data_setup/configs_mock_data.js b/ambari-web/test/mock_data_setup/configs_mock_data.js
index bfbd2b8..0136f9b 100644
--- a/ambari-web/test/mock_data_setup/configs_mock_data.js
+++ b/ambari-web/test/mock_data_setup/configs_mock_data.js
@@ -213,7 +213,7 @@ module.exports = {
       {
         "name": "hbase_log_dir",
         "value": "/hadoop/ams-hbase",
-        "serviceName": "AMS",
+        "serviceName": "AMBARI_METRICS",
         "filename": "ams-hbase-env.xml"
       }
     ];

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/ambari-web/test/utils/config_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/config_test.js b/ambari-web/test/utils/config_test.js
index 44e8951..d228f3a 100644
--- a/ambari-web/test/utils/config_test.js
+++ b/ambari-web/test/utils/config_test.js
@@ -254,7 +254,7 @@ describe('App.config', function () {
       expect(properties).to.have.length(2);
       expect(hbaseProperty.serviceName).to.equal('HBASE');
       expect(hbaseProperty.value).to.equal('/hadoop/hbase');
-      expect(amsProperty.serviceName).to.equal('AMS');
+      expect(amsProperty.serviceName).to.equal('AMBARI_METRICS');
       expect(amsProperty.value).to.equal('/hadoop/ams-hbase');
     });
   });

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/contrib/views/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/pom.xml b/contrib/views/pom.xml
index 04ed917..e6037f3 100644
--- a/contrib/views/pom.xml
+++ b/contrib/views/pom.xml
@@ -142,7 +142,7 @@
       <dependency>
         <groupId>org.apache.ambari</groupId>
         <artifactId>ambari-views</artifactId>
-        <version>[${ambari.version},)</version>
+        <version>2.0.0.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
index 192ce3f..ce36b57 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
@@ -263,8 +263,8 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController {
             }
             if (cluster.getDesiredConfigs().containsKey("ams-site")) {
               Map<String, String> amsConfigs = ambariClient.getConfiguration(cluster, "ams-site", cluster.getDesiredConfigs().get("ams-site"));
-              AmbariService amsService = ambariClient.getService(cluster, "AMS");
-              List<AmbariHostComponent> hostsList = amsService.getComponentsToHostComponentsMap().get("METRIC_COLLECTOR");
+              AmbariService amsService = ambariClient.getService(cluster, "AMBARI_METRICS");
+              List<AmbariHostComponent> hostsList = amsService.getComponentsToHostComponentsMap().get("METRICS_COLLECTOR");
               if (hostsList != null && hostsList.size() > 0) {
                 String collectorHostName = hostsList.get(0).getHostName();
                 newHadoopConfigs.put(PROPERTY_METRICS_SERVER_HOSTNAME, collectorHostName);

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/contrib/views/slider/src/main/resources/ui/app/initialize.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/initialize.js b/contrib/views/slider/src/main/resources/ui/app/initialize.js
index a0dd9a0..03fd52a 100755
--- a/contrib/views/slider/src/main/resources/ui/app/initialize.js
+++ b/contrib/views/slider/src/main/resources/ui/app/initialize.js
@@ -103,13 +103,13 @@ App.initializer({
       viewErrors: [],
 
       /**
-       * Host with Metrics Server (AMS)
+       * Host with Metrics Server (AMBARI_METRICS)
        * @type {string|null}
        */
       metricsHost: null,
 
       /**
-       * Port of Metrics Server (AMS port)
+       * Port of Metrics Server (AMBARI_METRICS port)
        * @type {array|null}
        */
       metricsPort: null,

http://git-wip-us.apache.org/repos/asf/ambari/blob/4eccfbc4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d33828b..c2055ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <artifactId>ambari</artifactId>
   <packaging>pom</packaging>
   <name>Ambari Main</name>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <description>Ambari</description>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>


Mime
View raw message