You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2017/12/25 01:51:54 UTC
[incubator-skywalking] 01/01: Move `apm-network` module under the
new root module `apm-protocol`. And add `apm-ui-query` under the
`apm-protocol` module.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch 5.0-alpha/ui-query-protocol
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 6e152b4fb03fbb4a2c9b76f0502017611e7fdb86
Author: wu-sheng <wu...@foxmail.com>
AuthorDate: Mon Dec 25 09:51:26 2017 +0800
Move `apm-network` module under the new root module `apm-protocol`. And add `apm-ui-query` under the `apm-protocol` module.
---
.../apm/commons/datacarrier/DataCarrierTest.java | 2 +-
{apm-network => apm-protocol/apm-network}/pom.xml | 2 +-
.../apm/network/trace/component/Component.java | 0
.../network/trace/component/ComponentsDefine.java | 0
.../network/trace/component/OfficialComponent.java | 0
.../main/proto/ApplicationRegisterService.proto | 0
.../src/main/proto/DiscoveryService.proto | 0
.../apm-network}/src/main/proto/Downstream.proto | 0
.../src/main/proto/JVMMetricsService.proto | 0
.../src/main/proto/KeyWithIntegerValue.proto | 0
.../src/main/proto/KeyWithStringValue.proto | 0
.../src/main/proto/TraceSegmentService.proto | 0
.../apm/network/trace/proto/GRPCNoServerTest.java | 0
apm-protocol/apm-ui-query/pom.xml | 33 +++++++++++++++++++
apm-protocol/pom.xml | 37 ++++++++++++++++++++++
pom.xml | 2 +-
16 files changed, 73 insertions(+), 3 deletions(-)
diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrierTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrierTest.java
index ca7096c..85d767e 100644
--- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrierTest.java
+++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrierTest.java
@@ -128,7 +128,7 @@ public class DataCarrierTest {
@Override
public void run() {
try {
- Thread.sleep(2000);
+ Thread.sleep(3000);
} catch (InterruptedException e) {
e.printStackTrace();
}
diff --git a/apm-network/pom.xml b/apm-protocol/apm-network/pom.xml
similarity index 99%
rename from apm-network/pom.xml
rename to apm-protocol/apm-network/pom.xml
index 7fbadf7..ceef977 100644
--- a/apm-network/pom.xml
+++ b/apm-protocol/apm-network/pom.xml
@@ -21,7 +21,7 @@
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>apm</artifactId>
+ <artifactId>apm-protocol</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>5.0.0-alpha</version>
</parent>
diff --git a/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/Component.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/Component.java
similarity index 100%
rename from apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/Component.java
rename to apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/Component.java
diff --git a/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
similarity index 100%
rename from apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
rename to apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
diff --git a/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java
similarity index 100%
rename from apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java
rename to apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java
diff --git a/apm-network/src/main/proto/ApplicationRegisterService.proto b/apm-protocol/apm-network/src/main/proto/ApplicationRegisterService.proto
similarity index 100%
rename from apm-network/src/main/proto/ApplicationRegisterService.proto
rename to apm-protocol/apm-network/src/main/proto/ApplicationRegisterService.proto
diff --git a/apm-network/src/main/proto/DiscoveryService.proto b/apm-protocol/apm-network/src/main/proto/DiscoveryService.proto
similarity index 100%
rename from apm-network/src/main/proto/DiscoveryService.proto
rename to apm-protocol/apm-network/src/main/proto/DiscoveryService.proto
diff --git a/apm-network/src/main/proto/Downstream.proto b/apm-protocol/apm-network/src/main/proto/Downstream.proto
similarity index 100%
rename from apm-network/src/main/proto/Downstream.proto
rename to apm-protocol/apm-network/src/main/proto/Downstream.proto
diff --git a/apm-network/src/main/proto/JVMMetricsService.proto b/apm-protocol/apm-network/src/main/proto/JVMMetricsService.proto
similarity index 100%
rename from apm-network/src/main/proto/JVMMetricsService.proto
rename to apm-protocol/apm-network/src/main/proto/JVMMetricsService.proto
diff --git a/apm-network/src/main/proto/KeyWithIntegerValue.proto b/apm-protocol/apm-network/src/main/proto/KeyWithIntegerValue.proto
similarity index 100%
rename from apm-network/src/main/proto/KeyWithIntegerValue.proto
rename to apm-protocol/apm-network/src/main/proto/KeyWithIntegerValue.proto
diff --git a/apm-network/src/main/proto/KeyWithStringValue.proto b/apm-protocol/apm-network/src/main/proto/KeyWithStringValue.proto
similarity index 100%
rename from apm-network/src/main/proto/KeyWithStringValue.proto
rename to apm-protocol/apm-network/src/main/proto/KeyWithStringValue.proto
diff --git a/apm-network/src/main/proto/TraceSegmentService.proto b/apm-protocol/apm-network/src/main/proto/TraceSegmentService.proto
similarity index 100%
rename from apm-network/src/main/proto/TraceSegmentService.proto
rename to apm-protocol/apm-network/src/main/proto/TraceSegmentService.proto
diff --git a/apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java b/apm-protocol/apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java
similarity index 100%
rename from apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java
rename to apm-protocol/apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java
diff --git a/apm-protocol/apm-ui-query/pom.xml b/apm-protocol/apm-ui-query/pom.xml
new file mode 100644
index 0000000..f67c5c8
--- /dev/null
+++ b/apm-protocol/apm-ui-query/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ 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>apm-protocol</artifactId>
+ <groupId>org.apache.skywalking</groupId>
+ <version>5.0.0-alpha</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>apm-ui-query</artifactId>
+
+
+</project>
\ No newline at end of file
diff --git a/apm-protocol/pom.xml b/apm-protocol/pom.xml
new file mode 100644
index 0000000..cc86849
--- /dev/null
+++ b/apm-protocol/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ 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>apm</artifactId>
+ <groupId>org.apache.skywalking</groupId>
+ <version>5.0.0-alpha</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>apm-protocol</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>apm-network</module>
+ <module>apm-ui-query</module>
+ </modules>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8f8d3a0..0473ff5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,8 +55,8 @@
<module>apm-commons</module>
<module>apm-sniffer</module>
<module>apm-application-toolkit</module>
- <module>apm-network</module>
<module>apm-collector</module>
+ <module>apm-protocol</module>
</modules>
<packaging>pom</packaging>
--
To stop receiving notification emails like this one, please contact
"commits@skywalking.apache.org" <co...@skywalking.apache.org>.