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/15 01:51:29 UTC
[incubator-skywalking] branch apache/readme_update updated: Update
more license.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch apache/readme_update
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/apache/readme_update by this push:
new 14c4734 Update more license.
14c4734 is described below
commit 14c4734f5816cd1eac6f48ffc1e5e3fe01cfba72
Author: wu-sheng <wu...@foxmail.com>
AuthorDate: Fri Dec 15 09:50:53 2017 +0800
Update more license.
---
README.md | 2 +-
README_ZH.md | 2 +-
...org.skywalking.apm.collector.core.module.Module | 19 +-------
...alking.apm.collector.core.module.ModuleProvider | 14 +++---
...ache.skywalking.apm.agent.core.boot.BootService | 53 ----------------------
docs/cn/Deploy-collector-in-cluster-mode-CN.md | 2 +-
docs/cn/Deploy-collector-in-standalone-mode-CN.md | 2 +-
docs/cn/Deploy-docker-image-CN.md | 2 +-
docs/cn/Deploy-skywalking-agent-CN.md | 2 +-
.../cn/How-to-communicate-with-the-collector-CN.md | 16 +++----
docs/cn/Quick-start-CN.md | 2 +-
docs/en/Deploy-collector-in-cluster-mode.md | 2 +-
docs/en/Deploy-collector-in-standalone-mode.md | 2 +-
docs/en/Deploy-docker-image.md | 2 +-
docs/en/Quick-start.md | 2 +-
pom.xml | 4 +-
16 files changed, 29 insertions(+), 99 deletions(-)
diff --git a/README.md b/README.md
index b03beb2..ceb7ee1 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Apache SkyWalking | [中文](README_ZH.md)
* Use **@Trace** annotation for any methods you want to trace.
* Integrate traceId into logs for log4j, log4j2 and logback.
* Pure Java server implementation, provide RESTful and gRPC services. Compatibility with other language agents/SDKs.
-* The UI released on [skywalking-ui](https://github.com/OpenSkywalking/sky-walking-ui)
+* The UI released on [skywalking-ui](https://github.com/apache/incubator-skywalking-ui)
# Architecture
* Architecture graph for 3.2.5+
diff --git a/README_ZH.md b/README_ZH.md
index 5f5efa6..8a055e7 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -20,7 +20,7 @@ Apache SkyWalking | [English](README.md)
* 将 traceId 集成到 log4j, log4j2 或 logback这些日志组件中
* 纯Java后端Collector实现，提供RESTful和gRPC接口。兼容接受其他语言探针发送数据
* [如何将探针的Metric和Trace数据上传到Collector？](/docs/cn/How-to-communicate-with-the-collector-CN.md)
-* UI工程请查看 [skywalking-ui](https://github.com/OpenSkywalking/skywalking-ui)
+* UI工程请查看 [skywalking-ui](https://github.com/apache/incubator-skywalking-ui)
* 中文QQ群：392443393
# Architecture
diff --git a/apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/resources/services/org.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/resources/services/org.skywalking.apm.collector.core.module.Module
index 54e322e..6696bf9 100644
--- a/apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/resources/services/org.skywalking.apm.collector.core.module.Module
+++ b/apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/resources/services/org.skywalking.apm.collector.core.module.Module
@@ -1,19 +1,2 @@
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
-#
-ComputingModule
+org.apache.skywalking.apm.collector.baseline.computing.ComputingModule
diff --git a/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/resources/services/org.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/resources/services/org.skywalking.apm.collector.core.module.ModuleProvider
index 07c6622..a529caa 100644
--- a/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/resources/services/org.skywalking.apm.collector.core.module.ModuleProvider
+++ b/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/resources/services/org.skywalking.apm.collector.core.module.ModuleProvider
@@ -1,9 +1,10 @@
#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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
+# 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
#
@@ -13,7 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# Project repository: https://github.com/OpenSkywalking/skywalking
#
-ComputingProvider
+org.apache.skywalking.collector.baseline.computing.provider.ComputingProvider
diff --git a/apm-sniffer/apm-agent-core/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.BootService b/apm-sniffer/apm-agent-core/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.BootService
index 4f1652d..4ed0679 100644
--- a/apm-sniffer/apm-agent-core/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.BootService
+++ b/apm-sniffer/apm-agent-core/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.BootService
@@ -16,59 +16,6 @@
#
#
-
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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.
-#
-# Repositories: https://github.com/OpenSkywalking/skywalking
-#
-
-#
-# Copyright 2017, Skywalking Authors All rights reserved.
-#
-# Licensed 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.
-#
-
-#
-# /*
-# * Copyright 2017, Skywalking Authors All rights reserved.
-# *
-# * Licensed 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.
-# */
-#
-
org.apache.skywalking.apm.agent.core.remote.TraceSegmentServiceClient
org.apache.skywalking.apm.agent.core.context.ContextManager
org.apache.skywalking.apm.agent.core.remote.CollectorDiscoveryService
diff --git a/docs/cn/Deploy-collector-in-cluster-mode-CN.md b/docs/cn/Deploy-collector-in-cluster-mode-CN.md
index 2fba44e..e73f3fd 100644
--- a/docs/cn/Deploy-collector-in-cluster-mode-CN.md
+++ b/docs/cn/Deploy-collector-in-cluster-mode-CN.md
@@ -5,7 +5,7 @@
- Zookeeper 3.4.10
## 下载发布版本
-- 前向[发布页面](https://github.com/OpenSkywalking/skywalking/releases)
+- 前向[发布页面](https://github.com/apache/incubator-skywalking/releases)
## 部署Elasticsearch
- 修改`elasticsearch.yml`文件
diff --git a/docs/cn/Deploy-collector-in-standalone-mode-CN.md b/docs/cn/Deploy-collector-in-standalone-mode-CN.md
index 7eca7f8..86351b5 100644
--- a/docs/cn/Deploy-collector-in-standalone-mode-CN.md
+++ b/docs/cn/Deploy-collector-in-standalone-mode-CN.md
@@ -5,7 +5,7 @@
- JDK8+
## 下载发布版本
-- 前向[发布页面](https://github.com/OpenSkywalking/skywalking/releases)
+- 前向[发布页面](https://github.com/apache/incubator-skywalking/releases)
## Quick Start
Collector单机模拟启动简单，提供和集群模式相同的功能，单机模式下除端口被占用的情况下，直接启动即可。
diff --git a/docs/cn/Deploy-docker-image-CN.md b/docs/cn/Deploy-docker-image-CN.md
index 48c403a..4969a07 100644
--- a/docs/cn/Deploy-docker-image-CN.md
+++ b/docs/cn/Deploy-docker-image-CN.md
@@ -1,4 +1,4 @@
-- [下载Source code](https://github.com/OpenSkywalking/skywalking/releases)并解压，进入解压目录，执行以下命令：
+- [下载Source code](https://github.com/apache/incubator-skywalking/releases)并解压，进入解压目录，执行以下命令：
```shell
> docker-compose pull
diff --git a/docs/cn/Deploy-skywalking-agent-CN.md b/docs/cn/Deploy-skywalking-agent-CN.md
index 976c0e5..6c3e730 100644
--- a/docs/cn/Deploy-skywalking-agent-CN.md
+++ b/docs/cn/Deploy-skywalking-agent-CN.md
@@ -1,5 +1,5 @@
## 下载skywalking探针发布版本
-- 前向[发布页面](https://github.com/OpenSkywalking/skywalking/releases)
+- 前向[发布页面](https://github.com/apache/incubator-skywalking/releases)
## 部署探针
1. 拷贝skywalking-agent目录到所需位置，探针包含整个目录，请不要改变目录结构
diff --git a/docs/cn/How-to-communicate-with-the-collector-CN.md b/docs/cn/How-to-communicate-with-the-collector-CN.md
index 8ca3b5b..84e82f0 100644
--- a/docs/cn/How-to-communicate-with-the-collector-CN.md
+++ b/docs/cn/How-to-communicate-with-the-collector-CN.md
@@ -33,7 +33,7 @@ JSON数组，数组的每个元素，为一个有效的gRPC服务地址。
gRPC服务
### 协议内容
-https://github.com/OpenSkywalking/skywalking/blob/master/apm-network/src/main/proto/ApplicationRegisterService.proto
+https://github.com/apache/incubator-skywalking/blob/master/apm-network/src/main/proto/ApplicationRegisterService.proto
```proto
syntax = "proto3";
@@ -71,7 +71,7 @@ message ApplicationMapping {
gRPC服务
### 实例注册服务
-https://github.com/OpenSkywalking/skywalking/blob/master/apm-network/src/main/proto/DiscoveryService.proto#L11-L12
+https://github.com/apache/incubator-skywalking/blob/master/apm-network/src/main/proto/DiscoveryService.proto#L11-L12
```proto
service InstanceDiscoveryService {
rpc register (ApplicationInstance) returns (ApplicationInstanceMapping) {
@@ -102,7 +102,7 @@ message ApplicationInstanceMapping {
- 服务端返回应用实例id，applicationInstanceId 。后续上报服务使用实例id标识。
### 实例心跳服务
-https://github.com/OpenSkywalking/skywalking/blob/master/apm-network/src/main/proto/DiscoveryService.proto#L14-L15
+https://github.com/apache/incubator-skywalking/blob/master/apm-network/src/main/proto/DiscoveryService.proto#L14-L15
```proto
service InstanceDiscoveryService {
rpc heartbeat (ApplicationInstanceHeartbeat) returns (Downstream) {
@@ -118,7 +118,7 @@ message ApplicationInstanceHeartbeat {
- 如一分钟内有segment数据上报，则可不必上报心跳。
### 实例注册重连服务
-https://github.com/OpenSkywalking/skywalking/blob/master/apm-network/src/main/proto/DiscoveryService.proto#L17-L18
+https://github.com/apache/incubator-skywalking/blob/master/apm-network/src/main/proto/DiscoveryService.proto#L17-L18
```proto
service InstanceDiscoveryService {
rpc registerRecover (ApplicationInstanceRecover) returns (Downstream) {
@@ -142,7 +142,7 @@ message ApplicationInstanceRecover {
gRPC服务
### 协议内容
-https://github.com/OpenSkywalking/skywalking/blob/master/apm-network/src/main/proto/DiscoveryService.proto#L53-L74
+https://github.com/apache/incubator-skywalking/blob/master/apm-network/src/main/proto/DiscoveryService.proto#L53-L74
```proto
//discovery service for ServiceName by Network address or application code
service ServiceNameDiscoveryService {
@@ -179,7 +179,7 @@ message ServiceNameElement {
gRPC服务
### 协议内容
-https://github.com/OpenSkywalking/skywalking/blob/master/apm-network/src/main/proto/JVMMetricsService.proto
+https://github.com/apache/incubator-skywalking/blob/master/apm-network/src/main/proto/JVMMetricsService.proto
```proto
syntax = "proto3";
@@ -342,11 +342,11 @@ message LogMessage {
}
```
- UniqueId为segment或者globalTraceId的数字表示。由3个long组成，1）applicationInstanceId，2）当前线程id，3）当前时间戳*10000 + seq(0-10000自循环)
-- Span的数据，请参考[插件开发规范](https://github.com/OpenSkywalking/skywalking/wiki/Plugin-Development-Guide)
+- Span的数据，请参考[插件开发规范](https://github.com/apache/incubator-skywalking/wiki/Plugin-Development-Guide)
- 以下id和名称根据注册返回结果，优先上报id，无法获取id时，再上传name。参考之前的应用和服务注册章节。
- operationNameId/operationName
- networkAddress/networkAddressId
- entryServiceName/entryServiceId
- parentServiceName/parentServiceId
- peerId/peer
-- componentId为默认支持的插件id，非官方支持，需传输名称或修改服务端源代码。[官方组件列表](https://github.com/OpenSkywalking/skywalking/blob/master/apm-network/src/main/java/org.apache.skywalking.apm/network/trace/component/ComponentsDefine.java)
+- componentId为默认支持的插件id，非官方支持，需传输名称或修改服务端源代码。[官方组件列表](https://github.com/apache/incubator-skywalking/blob/master/apm-network/src/main/java/org.apache.skywalking.apm/network/trace/component/ComponentsDefine.java)
diff --git a/docs/cn/Quick-start-CN.md b/docs/cn/Quick-start-CN.md
index 6f03d9a..21c2b67 100644
--- a/docs/cn/Quick-start-CN.md
+++ b/docs/cn/Quick-start-CN.md
@@ -2,6 +2,6 @@
1. 部署 Collector
1. [单机模式](Deploy-collector-in-standalone-mode-CN.md)
1. [集群模式](Deploy-collector-in-cluster-mode-CN.md)
-1. 部署 webui server, [doc](https://github.com/OpenSkywalking/skywalking-ui#quickstart)
+1. 部署 webui server, [doc](https://github.com/apache/incubator-skywalking-ui#quickstart)
1. 部署 Java Agent，[doc](Deploy-skywalking-agent-CN.md)
1. 重启并访问系统功能，查看UI即可。
\ No newline at end of file
diff --git a/docs/en/Deploy-collector-in-cluster-mode.md b/docs/en/Deploy-collector-in-cluster-mode.md
index bea5ca0..2cc5879 100644
--- a/docs/en/Deploy-collector-in-cluster-mode.md
+++ b/docs/en/Deploy-collector-in-cluster-mode.md
@@ -5,7 +5,7 @@
- Zookeeper 3.4.10
## Download released version
-- Go to [released page](https://github.com/OpenSkywalking/skywalking/releases)
+- Go to [released page](https://github.com/apache/incubator-skywalking/releases)
## Deploy Elasticsearch server
- Modify `elasticsearch.yml`
diff --git a/docs/en/Deploy-collector-in-standalone-mode.md b/docs/en/Deploy-collector-in-standalone-mode.md
index 375374e..7e3292d 100644
--- a/docs/en/Deploy-collector-in-standalone-mode.md
+++ b/docs/en/Deploy-collector-in-standalone-mode.md
@@ -7,7 +7,7 @@ If you are using skywalking in a low throughputs monitoring scenario, and don't
* JDK 8+
## Download
-* [Releases](https://github.com/OpenSkywalking/skywalking/releases)
+* [Releases](https://github.com/apache/incubator-skywalking/releases)
## Quick start
You can simplely tar/unzip and startup if ports 10800, 11800, 12800 are free.
diff --git a/docs/en/Deploy-docker-image.md b/docs/en/Deploy-docker-image.md
index be2c343..8d5470c 100644
--- a/docs/en/Deploy-docker-image.md
+++ b/docs/en/Deploy-docker-image.md
@@ -1,4 +1,4 @@
-- [Download source code](https://github.com/OpenSkywalking/skywalking/releases) and unzip source package. Execute following command under the unzipped directory.
+- [Download source code](https://github.com/apache/incubator-skywalking/releases) and unzip source package. Execute following command under the unzipped directory.
```shell
> docker-compose pull
diff --git a/docs/en/Quick-start.md b/docs/en/Quick-start.md
index 66d81d3..9e60433 100644
--- a/docs/en/Quick-start.md
+++ b/docs/en/Quick-start.md
@@ -2,6 +2,6 @@
1. Deploy Collector
1. [Standalone Mode](Deploy-collector-in-standalone-mode.md)
1. [Cluster Mode](Deploy-collector-in-cluster-mode.md)
-1. Deploy webui server, [doc](https://github.com/OpenSkywalking/skywalking-ui#quickstart)
+1. Deploy webui server, [doc](https://github.com/apache/incubator-skywalking-ui#quickstart)
1. Doploy Java Agent，[doc](Deploy-skywalking-agent.md)
1. Reboot your applications, and open UI.
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b2a5402..d2f0dd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,11 +61,11 @@
<packaging>pom</packaging>
<name>apm</name>
- <url>https://github.com/OpenSkywalking/skywalking</url>
+ <url>https://github.com/apache/incubator-skywalking</url>
<issueManagement>
<system>GitHub</system>
- <url>https://github.com/OpenSkywalking/skywalking/issues</url>
+ <url>https://github.com/apache/incubator-skywalking/issues</url>
</issueManagement>
<ciManagement>
--
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" <co...@skywalking.apache.org>'].