Rename app/package name to make gangliametric as a standalone app
Change-Id: Ie35c9848296646147081428b428d3507afbd2fb7
diff --git a/apps/metricsreporter/features.xml b/apps/gangliametrics/features.xml
similarity index 92%
rename from apps/metricsreporter/features.xml
rename to apps/gangliametrics/features.xml
index 5bba72a..53139dd 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 53669c8..6d68eb8 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 f2f48f4..7695c95 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 572e45c..b479bc5 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 0acbcf3..7b496228 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 c0eeb1a..2c12b8e 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 48f09f2..4799f9d 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>