From c0fe42d16a8f04091bb455a50f898cadf0cb45b9 Mon Sep 17 00:00:00 2001
From: Jian Li <pyguni@gmail.com>
Date: Mon, 28 Mar 2016 15:19:16 -0700
Subject: [PATCH] Rename app/package name to make gangliametric as a standalone
 app

Change-Id: Ie35c9848296646147081428b428d3507afbd2fb7
---
 apps/{metricsreporter => gangliametrics}/features.xml       | 2 +-
 apps/{metricsreporter => gangliametrics}/pom.xml            | 6 +++---
 .../onosproject/gangliametrics}/GangliaMetricsReporter.java | 2 +-
 .../org/onosproject/gangliametrics}/MetricsReporter.java    | 2 +-
 .../java/org/onosproject/gangliametrics}/package-info.java  | 2 +-
 .../gangliametrics}/GangliaMetricsReporterTest.java         | 2 +-
 apps/pom.xml                                                | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename apps/{metricsreporter => gangliametrics}/features.xml (93%)
 rename apps/{metricsreporter => gangliametrics}/pom.xml (95%)
 rename apps/{metricsreporter/src/main/java/org/onosproject/metrics/reporter => gangliametrics/src/main/java/org/onosproject/gangliametrics}/GangliaMetricsReporter.java (99%)
 rename apps/{metricsreporter/src/main/java/org/onosproject/metrics/reporter => gangliametrics/src/main/java/org/onosproject/gangliametrics}/MetricsReporter.java (95%)
 rename apps/{metricsreporter/src/main/java/org/onosproject/metrics/reporter => gangliametrics/src/main/java/org/onosproject/gangliametrics}/package-info.java (94%)
 rename apps/{metricsreporter/src/test/java/org/onosproject/metrics/reporter => gangliametrics/src/test/java/org/onosproject/gangliametrics}/GangliaMetricsReporterTest.java (98%)

diff --git a/apps/metricsreporter/features.xml b/apps/gangliametrics/features.xml
similarity index 93%
rename from apps/metricsreporter/features.xml
rename to apps/gangliametrics/features.xml
index 5bba72a52d..53139ddb2d 100644
--- a/apps/metricsreporter/features.xml
+++ b/apps/gangliametrics/features.xml
@@ -18,7 +18,7 @@
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <bundle>mvn:${project.groupId}/onos-app-metrics-reporter/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-app-ganglia/${project.version}</bundle>
         <bundle>mvn:io.dropwizard.metrics/metrics-core/3.1.2</bundle>
         <bundle>mvn:io.dropwizard.metrics/metrics-ganglia/3.1.2</bundle>
         <bundle>mvn:info.ganglia.gmetric4j/gmetric4j/1.0.10</bundle>
diff --git a/apps/metricsreporter/pom.xml b/apps/gangliametrics/pom.xml
similarity index 95%
rename from apps/metricsreporter/pom.xml
rename to apps/gangliametrics/pom.xml
index 53669c8a36..6d68eb8905 100644
--- a/apps/metricsreporter/pom.xml
+++ b/apps/gangliametrics/pom.xml
@@ -26,14 +26,14 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>onos-app-metrics-reporter</artifactId>
+    <artifactId>onos-app-ganglia</artifactId>
     <packaging>bundle</packaging>
 
     <description>Performance metric service reporter</description>
 
     <properties>
-        <onos.app.name>org.onosproject.metrics.reporter</onos.app.name>
-        <onos.app.title>Metric Service Reporter</onos.app.title>
+        <onos.app.name>org.onosproject.gangliametrics</onos.app.name>
+        <onos.app.title>Ganglia Report and Query App</onos.app.title>
         <onos.app.category>Monitoring</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <metrics.version>3.1.2</metrics.version>
diff --git a/apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/GangliaMetricsReporter.java b/apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/GangliaMetricsReporter.java
similarity index 99%
rename from apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/GangliaMetricsReporter.java
rename to apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/GangliaMetricsReporter.java
index f2f48f4f4f..7695c95880 100644
--- a/apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/GangliaMetricsReporter.java
+++ b/apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/GangliaMetricsReporter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.metrics.reporter;
+package org.onosproject.gangliametrics;
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.ganglia.GangliaReporter;
diff --git a/apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/MetricsReporter.java b/apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/MetricsReporter.java
similarity index 95%
rename from apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/MetricsReporter.java
rename to apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/MetricsReporter.java
index 572e45c011..b479bc598f 100644
--- a/apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/MetricsReporter.java
+++ b/apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/MetricsReporter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.metrics.reporter;
+package org.onosproject.gangliametrics;
 
 /**
  * A metric report that reports all metrics value to third party monitor.
diff --git a/apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/package-info.java b/apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/package-info.java
similarity index 94%
rename from apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/package-info.java
rename to apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/package-info.java
index 0acbcf3d68..7b496228a1 100644
--- a/apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/package-info.java
+++ b/apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/package-info.java
@@ -18,4 +18,4 @@
  * Contains various reporters that backup all of the collected metrics
  * to monitoring server.
  */
-package org.onosproject.metrics.reporter;
+package org.onosproject.gangliametrics;
diff --git a/apps/metricsreporter/src/test/java/org/onosproject/metrics/reporter/GangliaMetricsReporterTest.java b/apps/gangliametrics/src/test/java/org/onosproject/gangliametrics/GangliaMetricsReporterTest.java
similarity index 98%
rename from apps/metricsreporter/src/test/java/org/onosproject/metrics/reporter/GangliaMetricsReporterTest.java
rename to apps/gangliametrics/src/test/java/org/onosproject/gangliametrics/GangliaMetricsReporterTest.java
index c0eeb1ac84..2c12b8e715 100644
--- a/apps/metricsreporter/src/test/java/org/onosproject/metrics/reporter/GangliaMetricsReporterTest.java
+++ b/apps/gangliametrics/src/test/java/org/onosproject/gangliametrics/GangliaMetricsReporterTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.metrics.reporter;
+package org.onosproject.gangliametrics;
 
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableSet;
diff --git a/apps/pom.xml b/apps/pom.xml
index 48f09f2825..4799f9dafb 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -38,7 +38,6 @@
         <module>sdnip</module>
         <module>optical</module>
         <module>metrics</module>
-        <module>metricsreporter</module>
         <module>routing</module>
         <module>routing-api</module>
         <module>reactive-routing</module>
@@ -70,7 +69,8 @@
         <module>openstacknetworking</module>
         <module>openstackinterface</module>
         <module>influxdbmetrics</module>
-  </modules>
+        <module>gangliametrics</module>
+    </modules>
 
     <properties>
         <web.context>default</web.context>