From 4ff955ac3d507c151e7acfe4197157a5dd723fd3 Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Thu, 26 Oct 2017 13:39:27 +0800 Subject: [PATCH] Refactor the maven modules of collector. --- .../apm-collector-agent/agent-jvm/pom.xml | 14 ++++++++ .../agent-register/pom.xml | 15 ++++++++ .../apm-collector-agent/agent-tracing/pom.xml | 14 ++++++++ apm-collector/apm-collector-agent/pom.xml | 19 ++++++++++ apm-collector/apm-collector-boot/pom.xml | 3 +- .../apm/collector/boot/CollectorBoot.java | 33 +++++++++++++++++ apm-collector/apm-collector-cache/pom.xml | 15 ++++++++ apm-collector/apm-collector-cluster/pom.xml | 15 ++++++++ .../client-component/pom.xml | 15 ++++++++ .../persistence-component/pom.xml | 14 ++++++++ apm-collector/apm-collector-component/pom.xml | 22 ++++++++++++ .../queue-component/pom.xml | 15 ++++++++ .../remote-component/pom.xml | 15 ++++++++ .../server-component/pom.xml | 15 ++++++++ .../stream-component/pom.xml | 15 ++++++++ apm-collector/apm-collector-core/pom.xml | 15 ++++++++ .../module}/ApplicationConfiguration.java | 2 +- .../module}/DuplicateProviderException.java | 2 +- .../apm/collector/core/module}/Module.java | 2 +- .../collector/core/module}/ModuleManager.java | 2 +- .../core/module}/ModuleNotFoundException.java | 2 +- .../core/module}/ModuleProvider.java | 2 +- .../module}/ProviderNotFoundException.java | 2 +- .../apm/collector/core/module}/Service.java | 2 +- .../module}/ServiceNotProvidedException.java | 2 +- .../module}/ApplicationConfigurationTest.java | 2 +- .../collector/core/module}/BaseModuleA.java | 2 +- .../collector/core/module}/BaseModuleB.java | 2 +- .../core/module}/ModuleAProvider.java | 2 +- .../core/module}/ModuleBProvider.java | 2 +- .../core/module}/ModuleManagerTest.java | 2 +- .../collector/core/module}/TestModule.java | 2 +- .../core/module}/TestModuleProvider.java | 2 +- ...ywalking.apm.collector.modulization.Module | 0 ....apm.collector.modulization.ModuleProvider | 0 .../apm-collector-modulization-core/pom.xml | 35 ------------------- apm-collector/apm-collector-naming/pom.xml | 15 ++++++++ apm-collector/apm-collector-storage/pom.xml | 14 ++++++++ apm-collector/apm-collector-ui/pom.xml | 15 ++++++++ apm-collector/pom.xml | 9 ++++- 40 files changed, 321 insertions(+), 55 deletions(-) create mode 100644 apm-collector/apm-collector-agent/agent-jvm/pom.xml create mode 100644 apm-collector/apm-collector-agent/agent-register/pom.xml create mode 100644 apm-collector/apm-collector-agent/agent-tracing/pom.xml create mode 100644 apm-collector/apm-collector-agent/pom.xml create mode 100644 apm-collector/apm-collector-cache/pom.xml create mode 100644 apm-collector/apm-collector-cluster/pom.xml create mode 100644 apm-collector/apm-collector-component/client-component/pom.xml create mode 100644 apm-collector/apm-collector-component/persistence-component/pom.xml create mode 100644 apm-collector/apm-collector-component/pom.xml create mode 100644 apm-collector/apm-collector-component/queue-component/pom.xml create mode 100644 apm-collector/apm-collector-component/remote-component/pom.xml create mode 100644 apm-collector/apm-collector-component/server-component/pom.xml create mode 100644 apm-collector/apm-collector-component/stream-component/pom.xml create mode 100644 apm-collector/apm-collector-core/pom.xml rename apm-collector/{apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module}/ApplicationConfiguration.java (97%) rename apm-collector/{apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module}/DuplicateProviderException.java (94%) rename apm-collector/{apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module}/Module.java (98%) rename apm-collector/{apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module}/ModuleManager.java (98%) rename apm-collector/{apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module}/ModuleNotFoundException.java (94%) rename apm-collector/{apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module}/ModuleProvider.java (98%) rename apm-collector/{apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module}/ProviderNotFoundException.java (94%) rename apm-collector/{apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module}/Service.java (94%) rename apm-collector/{apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module}/ServiceNotProvidedException.java (94%) rename apm-collector/{apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module}/ApplicationConfigurationTest.java (97%) rename apm-collector/{apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module}/BaseModuleA.java (95%) rename apm-collector/{apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module}/BaseModuleB.java (95%) rename apm-collector/{apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module}/ModuleAProvider.java (96%) rename apm-collector/{apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module}/ModuleBProvider.java (96%) rename apm-collector/{apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module}/ModuleManagerTest.java (96%) rename apm-collector/{apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module}/TestModule.java (94%) rename apm-collector/{apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization => apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module}/TestModuleProvider.java (96%) rename apm-collector/{apm-collector-modulization-core => apm-collector-core}/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.Module (100%) rename apm-collector/{apm-collector-modulization-core => apm-collector-core}/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.ModuleProvider (100%) delete mode 100644 apm-collector/apm-collector-modulization-core/pom.xml create mode 100644 apm-collector/apm-collector-naming/pom.xml create mode 100644 apm-collector/apm-collector-storage/pom.xml create mode 100644 apm-collector/apm-collector-ui/pom.xml diff --git a/apm-collector/apm-collector-agent/agent-jvm/pom.xml b/apm-collector/apm-collector-agent/agent-jvm/pom.xml new file mode 100644 index 0000000000..efdeb599a6 --- /dev/null +++ b/apm-collector/apm-collector-agent/agent-jvm/pom.xml @@ -0,0 +1,14 @@ + + + + apm-collector-agent + org.skywalking + 3.2.3-2017 + + 4.0.0 + + agent-jvm + jar + \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/agent-register/pom.xml b/apm-collector/apm-collector-agent/agent-register/pom.xml new file mode 100644 index 0000000000..02757eb1df --- /dev/null +++ b/apm-collector/apm-collector-agent/agent-register/pom.xml @@ -0,0 +1,15 @@ + + + + apm-collector-agent + org.skywalking + 3.2.3-2017 + + 4.0.0 + + agent-register + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/agent-tracing/pom.xml b/apm-collector/apm-collector-agent/agent-tracing/pom.xml new file mode 100644 index 0000000000..74854e5332 --- /dev/null +++ b/apm-collector/apm-collector-agent/agent-tracing/pom.xml @@ -0,0 +1,14 @@ + + + + apm-collector-agent + org.skywalking + 3.2.3-2017 + + 4.0.0 + + agent-tracing + jar + \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/pom.xml b/apm-collector/apm-collector-agent/pom.xml new file mode 100644 index 0000000000..ea92cd8bf3 --- /dev/null +++ b/apm-collector/apm-collector-agent/pom.xml @@ -0,0 +1,19 @@ + + + + apm-collector + org.skywalking + 3.2.3-2017 + + 4.0.0 + + apm-collector-agent + pom + + agent-jvm + agent-register + agent-tracing + + \ No newline at end of file diff --git a/apm-collector/apm-collector-boot/pom.xml b/apm-collector/apm-collector-boot/pom.xml index 7fcd045187..9f6b7e9c7f 100644 --- a/apm-collector/apm-collector-boot/pom.xml +++ b/apm-collector/apm-collector-boot/pom.xml @@ -28,6 +28,5 @@ 4.0.0 apm-collector-boot - - + jar \ No newline at end of file diff --git a/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorBoot.java b/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorBoot.java index 8f2fa6f386..b6a489fbc9 100644 --- a/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorBoot.java +++ b/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorBoot.java @@ -18,5 +18,38 @@ package org.skywalking.apm.collector.boot; +import com.google.protobuf.InvalidProtocolBufferException; +import java.sql.ResultSet; +import java.sql.SQLException; +import org.skywalking.apm.network.proto.TraceSegmentObject; +import org.skywalking.apm.network.proto.TraceSegmentReference; + public class CollectorBoot { + + public static void main(String[] args) throws InvalidProtocolBufferException, H2ClientException { + H2Client client = new H2Client("jdbc:h2:~/h2", "sa", ""); + client.initialize(); + try (ResultSet rs = client.executeQuery("select * from segment", null)) { + while (rs.next()) { + byte[] dataBinary = rs.getBytes("data_binary"); + try { + parse(dataBinary); + } catch (InvalidProtocolBufferException e) { + } + } + } catch (SQLException | H2ClientException e) { + } + } + + public static void parse(byte[] dataBinary) throws InvalidProtocolBufferException { + TraceSegmentObject segmentObject = TraceSegmentObject.parseFrom(dataBinary); + for (TraceSegmentReference reference : segmentObject.getRefsList()) { + StringBuilder builder = new StringBuilder(); + builder.append("entry: ").append(reference.getEntryApplicationInstanceId()) + .append(" ,parent: ").append(reference.getParentApplicationInstanceId()) + .append(" ,network: ").append(reference.getNetworkAddressId()); + System.out.println(segmentObject.getApplicationId()); + System.out.println(builder.toString()); + } + } } diff --git a/apm-collector/apm-collector-cache/pom.xml b/apm-collector/apm-collector-cache/pom.xml new file mode 100644 index 0000000000..5bc4af1598 --- /dev/null +++ b/apm-collector/apm-collector-cache/pom.xml @@ -0,0 +1,15 @@ + + + + apm-collector + org.skywalking + 3.2.3-2017 + + 4.0.0 + + apm-collector-cache + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-cluster/pom.xml b/apm-collector/apm-collector-cluster/pom.xml new file mode 100644 index 0000000000..5b169089d8 --- /dev/null +++ b/apm-collector/apm-collector-cluster/pom.xml @@ -0,0 +1,15 @@ + + + + apm-collector + org.skywalking + 3.2.3-2017 + + 4.0.0 + + apm-collector-cluster + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-component/client-component/pom.xml b/apm-collector/apm-collector-component/client-component/pom.xml new file mode 100644 index 0000000000..612a3a5859 --- /dev/null +++ b/apm-collector/apm-collector-component/client-component/pom.xml @@ -0,0 +1,15 @@ + + + + apm-collector-component + org.skywalking + 3.2.3-2017 + + 4.0.0 + + client-component + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-component/persistence-component/pom.xml b/apm-collector/apm-collector-component/persistence-component/pom.xml new file mode 100644 index 0000000000..8095e0b1f8 --- /dev/null +++ b/apm-collector/apm-collector-component/persistence-component/pom.xml @@ -0,0 +1,14 @@ + + + + apm-collector-component + org.skywalking + 3.2.3-2017 + + 4.0.0 + + persistence-component + jar + \ No newline at end of file diff --git a/apm-collector/apm-collector-component/pom.xml b/apm-collector/apm-collector-component/pom.xml new file mode 100644 index 0000000000..353200d10c --- /dev/null +++ b/apm-collector/apm-collector-component/pom.xml @@ -0,0 +1,22 @@ + + + + apm-collector + org.skywalking + 3.2.3-2017 + + 4.0.0 + + apm-collector-component + pom + + client-component + server-component + queue-component + persistence-component + stream-component + remote-component + + \ No newline at end of file diff --git a/apm-collector/apm-collector-component/queue-component/pom.xml b/apm-collector/apm-collector-component/queue-component/pom.xml new file mode 100644 index 0000000000..166d4fcaaa --- /dev/null +++ b/apm-collector/apm-collector-component/queue-component/pom.xml @@ -0,0 +1,15 @@ + + + + apm-collector-component + org.skywalking + 3.2.3-2017 + + 4.0.0 + + queue-component + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-component/remote-component/pom.xml b/apm-collector/apm-collector-component/remote-component/pom.xml new file mode 100644 index 0000000000..5c17047d5e --- /dev/null +++ b/apm-collector/apm-collector-component/remote-component/pom.xml @@ -0,0 +1,15 @@ + + + + apm-collector-component + org.skywalking + 3.2.3-2017 + + 4.0.0 + + remote-component + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-component/server-component/pom.xml b/apm-collector/apm-collector-component/server-component/pom.xml new file mode 100644 index 0000000000..1664b0c9b1 --- /dev/null +++ b/apm-collector/apm-collector-component/server-component/pom.xml @@ -0,0 +1,15 @@ + + + + apm-collector-component + org.skywalking + 3.2.3-2017 + + 4.0.0 + + server-component + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-component/stream-component/pom.xml b/apm-collector/apm-collector-component/stream-component/pom.xml new file mode 100644 index 0000000000..bb71c74701 --- /dev/null +++ b/apm-collector/apm-collector-component/stream-component/pom.xml @@ -0,0 +1,15 @@ + + + + apm-collector-component + org.skywalking + 3.2.3-2017 + + 4.0.0 + + stream-component + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-core/pom.xml b/apm-collector/apm-collector-core/pom.xml new file mode 100644 index 0000000000..92e2cf6af2 --- /dev/null +++ b/apm-collector/apm-collector-core/pom.xml @@ -0,0 +1,15 @@ + + + + apm-collector + org.skywalking + 3.2.3-2017 + + 4.0.0 + + apm-collector-core + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ApplicationConfiguration.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ApplicationConfiguration.java similarity index 97% rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ApplicationConfiguration.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ApplicationConfiguration.java index d0a7db7e4f..9acba5a055 100644 --- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ApplicationConfiguration.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ApplicationConfiguration.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; import java.util.HashMap; import java.util.Properties; diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/DuplicateProviderException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/DuplicateProviderException.java similarity index 94% rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/DuplicateProviderException.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/DuplicateProviderException.java index 7997b0daf9..a689dc4156 100644 --- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/DuplicateProviderException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/DuplicateProviderException.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; public class DuplicateProviderException extends Exception { public DuplicateProviderException(String message) { diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/Module.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/Module.java similarity index 98% rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/Module.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/Module.java index 291a63eed2..29f823c6dc 100644 --- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/Module.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/Module.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; import java.util.LinkedList; import java.util.List; diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleManager.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleManager.java similarity index 98% rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleManager.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleManager.java index 411eb830a2..1a10e13cb1 100644 --- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleManager.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleManager.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; import java.util.Arrays; import java.util.HashMap; diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleNotFoundException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleNotFoundException.java similarity index 94% rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleNotFoundException.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleNotFoundException.java index d08820fda8..6c6ad4a499 100644 --- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleNotFoundException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleNotFoundException.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; public class ModuleNotFoundException extends Exception { diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleProvider.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleProvider.java similarity index 98% rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleProvider.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleProvider.java index 6c82aced2e..5c3315bdf9 100644 --- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleProvider.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleProvider.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; import java.util.HashMap; import java.util.Map; diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ProviderNotFoundException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ProviderNotFoundException.java similarity index 94% rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ProviderNotFoundException.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ProviderNotFoundException.java index a19b75ad8c..aa037fbc6b 100644 --- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ProviderNotFoundException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ProviderNotFoundException.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; public class ProviderNotFoundException extends Exception { public ProviderNotFoundException(String message) { diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/Service.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/Service.java similarity index 94% rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/Service.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/Service.java index 14666f2a43..18a1f4f08f 100644 --- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/Service.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/Service.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; /** * The Service implementation is a service provided by its own modules. diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ServiceNotProvidedException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ServiceNotProvidedException.java similarity index 94% rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ServiceNotProvidedException.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ServiceNotProvidedException.java index 3ca550332b..1f97914d38 100644 --- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ServiceNotProvidedException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ServiceNotProvidedException.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; public class ServiceNotProvidedException extends Exception { public ServiceNotProvidedException(String message) { diff --git a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ApplicationConfigurationTest.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ApplicationConfigurationTest.java similarity index 97% rename from apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ApplicationConfigurationTest.java rename to apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ApplicationConfigurationTest.java index 73296d370a..0899c91654 100644 --- a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ApplicationConfigurationTest.java +++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ApplicationConfigurationTest.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; import java.util.Properties; import org.junit.Assert; diff --git a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/BaseModuleA.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/BaseModuleA.java similarity index 95% rename from apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/BaseModuleA.java rename to apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/BaseModuleA.java index 18f9638e0d..8ea63822cb 100644 --- a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/BaseModuleA.java +++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/BaseModuleA.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; /** * @author wu-sheng diff --git a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/BaseModuleB.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/BaseModuleB.java similarity index 95% rename from apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/BaseModuleB.java rename to apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/BaseModuleB.java index bfe412a035..6313b0bd1d 100644 --- a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/BaseModuleB.java +++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/BaseModuleB.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; /** * @author wu-sheng diff --git a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleAProvider.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleAProvider.java similarity index 96% rename from apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleAProvider.java rename to apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleAProvider.java index 54ee3f02d7..2dd062278b 100644 --- a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleAProvider.java +++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleAProvider.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; import java.util.Properties; diff --git a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleBProvider.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleBProvider.java similarity index 96% rename from apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleBProvider.java rename to apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleBProvider.java index e49c750352..ea47251885 100644 --- a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleBProvider.java +++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleBProvider.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; import java.util.Properties; diff --git a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleManagerTest.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleManagerTest.java similarity index 96% rename from apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleManagerTest.java rename to apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleManagerTest.java index 30e33969ad..2d96c8c250 100644 --- a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleManagerTest.java +++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleManagerTest.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; import org.junit.Test; diff --git a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/TestModule.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/TestModule.java similarity index 94% rename from apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/TestModule.java rename to apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/TestModule.java index fe59136bf8..de78800c1a 100644 --- a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/TestModule.java +++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/TestModule.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; /** * @author wu-sheng diff --git a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/TestModuleProvider.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/TestModuleProvider.java similarity index 96% rename from apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/TestModuleProvider.java rename to apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/TestModuleProvider.java index 590f5c7b3d..8e665cae93 100644 --- a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/TestModuleProvider.java +++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/TestModuleProvider.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.modulization; +package org.skywalking.apm.collector.core.module; import java.util.Properties; diff --git a/apm-collector/apm-collector-modulization-core/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.Module b/apm-collector/apm-collector-core/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.Module similarity index 100% rename from apm-collector/apm-collector-modulization-core/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.Module rename to apm-collector/apm-collector-core/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.Module diff --git a/apm-collector/apm-collector-modulization-core/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.ModuleProvider b/apm-collector/apm-collector-core/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.ModuleProvider similarity index 100% rename from apm-collector/apm-collector-modulization-core/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.ModuleProvider rename to apm-collector/apm-collector-core/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.ModuleProvider diff --git a/apm-collector/apm-collector-modulization-core/pom.xml b/apm-collector/apm-collector-modulization-core/pom.xml deleted file mode 100644 index d3a428da86..0000000000 --- a/apm-collector/apm-collector-modulization-core/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - apm-collector - org.skywalking - 3.2.3-2017 - - 4.0.0 - - apm-collector-modulization-core - - - UTF-8 - - \ No newline at end of file diff --git a/apm-collector/apm-collector-naming/pom.xml b/apm-collector/apm-collector-naming/pom.xml new file mode 100644 index 0000000000..1127f73e43 --- /dev/null +++ b/apm-collector/apm-collector-naming/pom.xml @@ -0,0 +1,15 @@ + + + + apm-collector + org.skywalking + 3.2.3-2017 + + 4.0.0 + + apm-collector-naming + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-storage/pom.xml b/apm-collector/apm-collector-storage/pom.xml new file mode 100644 index 0000000000..bce8904c08 --- /dev/null +++ b/apm-collector/apm-collector-storage/pom.xml @@ -0,0 +1,14 @@ + + + + apm-collector + org.skywalking + 3.2.3-2017 + + 4.0.0 + + apm-collector-storage + jar + \ No newline at end of file diff --git a/apm-collector/apm-collector-ui/pom.xml b/apm-collector/apm-collector-ui/pom.xml new file mode 100644 index 0000000000..e6f94973b4 --- /dev/null +++ b/apm-collector/apm-collector-ui/pom.xml @@ -0,0 +1,15 @@ + + + + apm-collector + org.skywalking + 3.2.3-2017 + + 4.0.0 + + apm-collector-ui + jar + + \ No newline at end of file diff --git a/apm-collector/pom.xml b/apm-collector/pom.xml index e38082b084..36b573086e 100644 --- a/apm-collector/pom.xml +++ b/apm-collector/pom.xml @@ -32,7 +32,14 @@ pom apm-collector-boot - apm-collector-modulization-core + apm-collector-ui + apm-collector-agent + apm-collector-core + apm-collector-component + apm-collector-cluster + apm-collector-cache + apm-collector-storage + apm-collector-naming -- GitLab