From 119837a835c7f7f4e0524c8607af817d20909640 Mon Sep 17 00:00:00 2001
From: peng-yongsheng <8082209@qq.com>
Date: Sun, 26 Nov 2017 23:20:54 +0800
Subject: [PATCH] Submit the missing code for naming change.

---
 .../collector-alerting-provider/pom.xml            |  5 +++++
 .../collector/alerting/AlertingModuleProvider.java |  2 +-
 apm-collector/apm-collector-boot/pom.xml           | 14 ++++++++++++++
 .../src/main/resources/application-default.yml     |  2 ++
 ...java => ApplicationComponentEsTableDefine.java} |  4 ++--
 ...e.java => ApplicationMappingEsTableDefine.java} |  4 ++--
 .../main/resources/META-INF/defines/storage.define |  6 +++---
 ...java => ApplicationComponentH2TableDefine.java} |  4 ++--
 ...e.java => ApplicationMappingH2TableDefine.java} |  4 ++--
 .../main/resources/META-INF/defines/storage.define |  6 +++---
 10 files changed, 36 insertions(+), 15 deletions(-)
 rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/{NodeComponentEsTableDefine.java => ApplicationComponentEsTableDefine.java} (92%)
 rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/{NodeMappingEsTableDefine.java => ApplicationMappingEsTableDefine.java} (92%)
 rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/{NodeComponentH2TableDefine.java => ApplicationComponentH2TableDefine.java} (93%)
 rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/{NodeMappingH2TableDefine.java => ApplicationMappingH2TableDefine.java} (93%)

diff --git a/apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml b/apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml
index 24ad89baec..91688271ef 100644
--- a/apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml
+++ b/apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml
@@ -31,6 +31,11 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>org.skywalking</groupId>
+            <artifactId>collector-alerting-define</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.skywalking</groupId>
             <artifactId>collector-agent-stream-define</artifactId>
diff --git a/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/skywalking/apm/collector/alerting/AlertingModuleProvider.java b/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/skywalking/apm/collector/alerting/AlertingModuleProvider.java
index 9eaccab180..b5ab73e870 100644
--- a/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/skywalking/apm/collector/alerting/AlertingModuleProvider.java
+++ b/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/skywalking/apm/collector/alerting/AlertingModuleProvider.java
@@ -34,7 +34,7 @@ public class AlertingModuleProvider extends ModuleProvider {
     }
 
     @Override public Class<? extends Module> module() {
-        return null;
+        return AlertingModule.class;
     }
 
     @Override public void prepare(Properties config) throws ServiceNotProvidedException {
diff --git a/apm-collector/apm-collector-boot/pom.xml b/apm-collector/apm-collector-boot/pom.xml
index caec74d408..df8ceb3c8a 100644
--- a/apm-collector/apm-collector-boot/pom.xml
+++ b/apm-collector/apm-collector-boot/pom.xml
@@ -150,6 +150,20 @@
             <version>${project.version}</version>
         </dependency>
         <!-- cache provider -->
+        <!-- configuration provider -->
+        <dependency>
+            <groupId>org.skywalking</groupId>
+            <artifactId>collector-configuration-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- configuration provider -->
+        <!-- alerting provider -->
+        <dependency>
+            <groupId>org.skywalking</groupId>
+            <artifactId>collector-alerting-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- alerting provider -->
     </dependencies>
 
     <build>
diff --git a/apm-collector/apm-collector-core/src/main/resources/application-default.yml b/apm-collector/apm-collector-core/src/main/resources/application-default.yml
index 4ecad1dbb9..0c767ff5c8 100644
--- a/apm-collector/apm-collector-core/src/main/resources/application-default.yml
+++ b/apm-collector/apm-collector-core/src/main/resources/application-default.yml
@@ -31,6 +31,8 @@ agent_stream:
     buffer_segment_max_file_size: 500M
 configuration:
   default:
+alerting:
+  default:
 ui:
   jetty:
     host: localhost
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ApplicationComponentEsTableDefine.java
similarity index 92%
rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java
rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ApplicationComponentEsTableDefine.java
index 3323a5b47c..91d1b98dee 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ApplicationComponentEsTableDefine.java
@@ -25,9 +25,9 @@ import org.skywalking.apm.collector.storage.table.application.ApplicationCompone
 /**
  * @author peng-yongsheng
  */
-public class NodeComponentEsTableDefine extends ElasticSearchTableDefine {
+public class ApplicationComponentEsTableDefine extends ElasticSearchTableDefine {
 
-    public NodeComponentEsTableDefine() {
+    public ApplicationComponentEsTableDefine() {
         super(ApplicationComponentTable.TABLE);
     }
 
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ApplicationMappingEsTableDefine.java
similarity index 92%
rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java
rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ApplicationMappingEsTableDefine.java
index a56a54f518..c446a913f0 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ApplicationMappingEsTableDefine.java
@@ -25,9 +25,9 @@ import org.skywalking.apm.collector.storage.table.application.ApplicationMapping
 /**
  * @author peng-yongsheng
  */
-public class NodeMappingEsTableDefine extends ElasticSearchTableDefine {
+public class ApplicationMappingEsTableDefine extends ElasticSearchTableDefine {
 
-    public NodeMappingEsTableDefine() {
+    public ApplicationMappingEsTableDefine() {
         super(ApplicationMappingTable.TABLE);
     }
 
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define
index 539421a58b..00be075e88 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define
@@ -7,9 +7,9 @@ org.skywalking.apm.collector.storage.es.define.MemoryMetricEsTableDefine
 org.skywalking.apm.collector.storage.es.define.MemoryPoolMetricEsTableDefine
 org.skywalking.apm.collector.storage.es.define.GlobalTraceEsTableDefine
 org.skywalking.apm.collector.storage.es.define.InstPerformanceEsTableDefine
-org.skywalking.apm.collector.storage.es.define.NodeComponentEsTableDefine
-org.skywalking.apm.collector.storage.es.define.NodeMappingEsTableDefine
-org.skywalking.apm.collector.storage.es.define.NodeReferenceEsTableDefine
+org.skywalking.apm.collector.storage.es.define.ApplicationComponentEsTableDefine
+org.skywalking.apm.collector.storage.es.define.ApplicationMappingEsTableDefine
+org.skywalking.apm.collector.storage.es.define.ApplicationReferenceMetricEsTableDefine
 org.skywalking.apm.collector.storage.es.define.SegmentCostEsTableDefine
 org.skywalking.apm.collector.storage.es.define.SegmentEsTableDefine
 org.skywalking.apm.collector.storage.es.define.ServiceEntryEsTableDefine
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ApplicationComponentH2TableDefine.java
similarity index 93%
rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java
rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ApplicationComponentH2TableDefine.java
index 1c50caafd0..c1ec446b1a 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ApplicationComponentH2TableDefine.java
@@ -25,9 +25,9 @@ import org.skywalking.apm.collector.storage.table.application.ApplicationCompone
 /**
  * @author peng-yongsheng
  */
-public class NodeComponentH2TableDefine extends H2TableDefine {
+public class ApplicationComponentH2TableDefine extends H2TableDefine {
 
-    public NodeComponentH2TableDefine() {
+    public ApplicationComponentH2TableDefine() {
         super(ApplicationComponentTable.TABLE);
     }
 
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ApplicationMappingH2TableDefine.java
similarity index 93%
rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java
rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ApplicationMappingH2TableDefine.java
index 06feef8b3e..7568c0c3cb 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ApplicationMappingH2TableDefine.java
@@ -25,9 +25,9 @@ import org.skywalking.apm.collector.storage.table.application.ApplicationMapping
 /**
  * @author peng-yongsheng
  */
-public class NodeMappingH2TableDefine extends H2TableDefine {
+public class ApplicationMappingH2TableDefine extends H2TableDefine {
 
-    public NodeMappingH2TableDefine() {
+    public ApplicationMappingH2TableDefine() {
         super(ApplicationMappingTable.TABLE);
     }
 
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/resources/META-INF/defines/storage.define b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/resources/META-INF/defines/storage.define
index da36dc97fd..339e10e189 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/resources/META-INF/defines/storage.define
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/resources/META-INF/defines/storage.define
@@ -7,9 +7,9 @@ org.skywalking.apm.collector.storage.h2.define.MemoryMetricH2TableDefine
 org.skywalking.apm.collector.storage.h2.define.MemoryPoolMetricH2TableDefine
 org.skywalking.apm.collector.storage.h2.define.GlobalTraceH2TableDefine
 org.skywalking.apm.collector.storage.h2.define.InstPerformanceH2TableDefine
-org.skywalking.apm.collector.storage.h2.define.NodeComponentH2TableDefine
-org.skywalking.apm.collector.storage.h2.define.NodeMappingH2TableDefine
-org.skywalking.apm.collector.storage.h2.define.NodeReferenceH2TableDefine
+org.skywalking.apm.collector.storage.h2.define.ApplicationComponentH2TableDefine
+org.skywalking.apm.collector.storage.h2.define.ApplicationMappingH2TableDefine
+org.skywalking.apm.collector.storage.h2.define.ApplicationReferenceMetricH2TableDefine
 org.skywalking.apm.collector.storage.h2.define.SegmentCostH2TableDefine
 org.skywalking.apm.collector.storage.h2.define.SegmentH2TableDefine
 org.skywalking.apm.collector.storage.h2.define.ServiceEntryH2TableDefine
-- 
GitLab