kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename analysis layer register to analysis register.

This commit is contained in:
peng-yongsheng 2017-12-18 17:34:06 +08:00
parent 5d4a00d0ca
commit 3afb0c4a84
16 changed files with 42 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apm-collector/apm-collector-analysis/analysis-layer-register/pom.xml → apm-collector/apm-collector-analysis/analysis-register/pom.xml
View File

@ -27,11 +27,11 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>analysis-layer-register</artifactId>
<artifactId>analysis-register</artifactId>
<packaging>pom</packaging>
<modules>
<module>layer-register-define</module>
<module>layer-register-provider</module>
<module>register-define</module>
<module>register-provider</module>
</modules>

7
apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/pom.xml → apm-collector/apm-collector-analysis/analysis-register/register-define/pom.xml
View File

@ -21,12 +21,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>analysis-layer-register</artifactId>
<artifactId>analysis-register</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>5.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>layer-register-define</artifactId>
<packaging>jar</packaging>
<artifactId>register-define</artifactId>
</project>

12
apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/AnalysisLayerRegisterModule.java → apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/AnalysisRegisterModule.java
View File

@ -16,19 +16,19 @@
*
*/
package org.apache.skywalking.apm.collector.analysis.layer.register.define;
package org.apache.skywalking.apm.collector.analysis.register.define;
import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IApplicationIDService;
import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IInstanceIDService;
import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IServiceNameService;
import org.apache.skywalking.apm.collector.analysis.register.define.service.IApplicationIDService;
import org.apache.skywalking.apm.collector.analysis.register.define.service.IInstanceIDService;
import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService;
import org.apache.skywalking.apm.collector.core.module.Module;
/**
* @author peng-yongsheng
*/
public class AnalysisLayerRegisterModule extends Module {
public class AnalysisRegisterModule extends Module {
public static final String NAME = "analysis_layer_register";
public static final String NAME = "analysis_register";
@Override public String name() {
return NAME;

2
apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/service/IApplicationIDService.java → apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/IApplicationIDService.java
View File

@ -17,7 +17,7 @@
*/
package org.apache.skywalking.apm.collector.analysis.layer.register.define.service;
package org.apache.skywalking.apm.collector.analysis.register.define.service;
import org.apache.skywalking.apm.collector.core.module.Service;

2
apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/service/IInstanceIDService.java → apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/IInstanceIDService.java
View File

@ -17,7 +17,7 @@
*/
package org.apache.skywalking.apm.collector.analysis.layer.register.define.service;
package org.apache.skywalking.apm.collector.analysis.register.define.service;
import org.apache.skywalking.apm.collector.core.module.Service;

2
apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/service/IServiceNameService.java → apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/IServiceNameService.java
View File

@ -17,7 +17,7 @@
*/
package org.apache.skywalking.apm.collector.analysis.layer.register.define.service;
package org.apache.skywalking.apm.collector.analysis.register.define.service;
import org.apache.skywalking.apm.collector.core.module.Service;

2
apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module → apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module
View File

@ -16,4 +16,4 @@
#
#
org.apache.skywalking.apm.collector.analysis.layer.register.define.AnalysisLayerRegisterModule
org.apache.skywalking.apm.collector.analysis.register.define.AnalysisRegisterModule

11
apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/pom.xml → apm-collector/apm-collector-analysis/analysis-register/register-provider/pom.xml
View File

@ -21,24 +21,19 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>analysis-layer-register</artifactId>
<artifactId>analysis-register</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>5.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>layer-register-provider</artifactId>
<artifactId>register-provider</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>layer-register-define</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>collector-cache-define</artifactId>
<artifactId>register-define</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

20
apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/AnalysisLayerRegisterModuleProvider.java → apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/AnalysisRegisterModuleProvider.java
View File

@ -16,16 +16,16 @@
*
*/
package org.apache.skywalking.apm.collector.analysis.layer.register.provider;
package org.apache.skywalking.apm.collector.analysis.register.provider;
import java.util.Properties;
import org.apache.skywalking.apm.collector.analysis.layer.register.define.AnalysisLayerRegisterModule;
import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IApplicationIDService;
import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IInstanceIDService;
import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IServiceNameService;
import org.apache.skywalking.apm.collector.analysis.layer.register.provider.service.ApplicationIDService;
import org.apache.skywalking.apm.collector.analysis.layer.register.provider.service.InstanceIDService;
import org.apache.skywalking.apm.collector.analysis.layer.register.provider.service.ServiceNameService;
import org.apache.skywalking.apm.collector.analysis.register.define.AnalysisRegisterModule;
import org.apache.skywalking.apm.collector.analysis.register.define.service.IApplicationIDService;
import org.apache.skywalking.apm.collector.analysis.register.define.service.IInstanceIDService;
import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService;
import org.apache.skywalking.apm.collector.analysis.register.provider.service.ApplicationIDService;
import org.apache.skywalking.apm.collector.analysis.register.provider.service.InstanceIDService;
import org.apache.skywalking.apm.collector.analysis.register.provider.service.ServiceNameService;
import org.apache.skywalking.apm.collector.core.module.Module;
import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
@ -33,7 +33,7 @@ import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedExcepti
/**
* @author peng-yongsheng
*/
public class AnalysisLayerRegisterModuleProvider extends ModuleProvider {
public class AnalysisRegisterModuleProvider extends ModuleProvider {
public static final String NAME = "default";
@ -42,7 +42,7 @@ public class AnalysisLayerRegisterModuleProvider extends ModuleProvider {
}
@Override public Class<? extends Module> module() {
return AnalysisLayerRegisterModule.class;
return AnalysisRegisterModule.class;
}
@Override public void prepare(Properties config) throws ServiceNotProvidedException {

4
apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/service/ApplicationIDService.java → apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/ApplicationIDService.java
View File

@ -16,9 +16,9 @@
*
*/
package org.apache.skywalking.apm.collector.analysis.layer.register.provider.service;
package org.apache.skywalking.apm.collector.analysis.register.provider.service;
import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IApplicationIDService;
import org.apache.skywalking.apm.collector.analysis.register.define.service.IApplicationIDService;
import org.apache.skywalking.apm.collector.cache.CacheModule;
import org.apache.skywalking.apm.collector.cache.service.ApplicationCacheService;
import org.apache.skywalking.apm.collector.core.graph.Graph;

4
apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/service/InstanceIDService.java → apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/InstanceIDService.java
View File

@ -16,9 +16,9 @@
*
*/
package org.apache.skywalking.apm.collector.analysis.layer.register.provider.service;
package org.apache.skywalking.apm.collector.analysis.register.provider.service;
import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IInstanceIDService;
import org.apache.skywalking.apm.collector.analysis.register.define.service.IInstanceIDService;
import org.apache.skywalking.apm.collector.cache.CacheModule;
import org.apache.skywalking.apm.collector.cache.service.InstanceCacheService;
import org.apache.skywalking.apm.collector.core.graph.Graph;

4
apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/service/ServiceNameService.java → apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/ServiceNameService.java
View File

@ -16,9 +16,9 @@
*
*/
package org.apache.skywalking.apm.collector.analysis.layer.register.provider.service;
package org.apache.skywalking.apm.collector.analysis.register.provider.service;
import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IServiceNameService;
import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService;
import org.apache.skywalking.apm.collector.cache.CacheModule;
import org.apache.skywalking.apm.collector.cache.service.ServiceIdCacheService;
import org.apache.skywalking.apm.collector.core.graph.Graph;

2
apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider → apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider
View File

@ -16,4 +16,4 @@
#
#
org.apache.skywalking.apm.collector.analysis.layer.register.provider.AnalysisLayerRegisterModuleProvider
org.apache.skywalking.apm.collector.analysis.register.provider.AnalysisRegisterModuleProvider

4
apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java
View File

@ -19,8 +19,8 @@
package org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser.standardization;
import org.apache.skywalking.apm.collector.analysis.layer.register.define.AnalysisLayerRegisterModule;
import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IApplicationIDService;
import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IServiceNameService;
import org.apache.skywalking.apm.collector.analysis.register.define.service.IApplicationIDService;
import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService;
import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.ReferenceDecorator;
import org.apache.skywalking.apm.collector.cache.CacheModule;
import org.apache.skywalking.apm.collector.cache.service.InstanceCacheService;

4
apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java
View File

@ -19,8 +19,8 @@
package org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser.standardization;
import org.apache.skywalking.apm.collector.analysis.layer.register.define.AnalysisLayerRegisterModule;
import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IApplicationIDService;
import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IServiceNameService;
import org.apache.skywalking.apm.collector.analysis.register.define.service.IApplicationIDService;
import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService;
import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.SpanDecorator;
import org.apache.skywalking.apm.collector.core.module.ModuleManager;
import org.apache.skywalking.apm.collector.core.util.Const;

2
apm-collector/apm-collector-analysis/pom.xml
View File

@ -31,11 +31,11 @@
<packaging>pom</packaging>
<modules>
<module>analysis-segment-parser</module>
<module>analysis-layer-register</module>
<module>analysis-alarm</module>
<module>analysis-baseline</module>
<module>analysis-worker-model</module>
<module>analysis-metric</module>
<module>analysis-register</module>
</modules>
<dependencies>