Skip to content

Commit

Permalink
[INLONG-613] Adjust the project codes according to the renaming requi…
Browse files Browse the repository at this point in the history
…rements (apache#501)

Co-authored-by: gosonzhang <[email protected]>
Co-authored-by: zhaolei-best <[email protected]>
Co-authored-by: thirtyzhao <[email protected]>
Co-authored-by: chantccc <[email protected]>
Co-authored-by: tianqiwan <[email protected]>
Co-authored-by: Daniel <[email protected]>
Co-authored-by: ziruipeng <[email protected]>
Co-authored-by: stingpeng <[email protected]>
  • Loading branch information
9 people authored Jul 6, 2021
1 parent a83dc82 commit 4b22232
Show file tree
Hide file tree
Showing 1,846 changed files with 156,513 additions and 4,306 deletions.
6 changes: 3 additions & 3 deletions .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
# 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
# <p>
#
# http://www.apache.org/licenses/LICENSE-2.0
# <p>
#
# 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.

# This file controls the integration of TubeMQ project with ASF infrastructure. Refer to
# This file controls the integration of InLong project with ASF infrastructure. Refer to
# https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories for
# details. Be careful when changing the contents of this file since it may affect many developers
# of the project and make sure to discuss the changes with dev@ before committing.
Expand Down
46 changes: 41 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,49 @@
.idea/
target/
*.iml
/.metadata/
# Common
*.class
!.github/
!.gitignore
!.gitkeep
!.travis.yml

# Eclipse
.classpath
.project
.settings/
.recommenders/
.factorypath
/.metadata/

# Intellij
.idea/
*.iml
*.iws

# NetBeans
nb-configuration.xml

# Mac
**/.DS_Store
.java-version

# VisualStudioCode artifacts
.vscode/

# Maven
log/
target/
target/dist/

# Python
venv/
eggs/
wheels/
tubemq-client-twins/tubemq-client-cpp/build/
*.pyc

# C/C++
inlong-tubemq/tubemq-client-twins/tubemq-client-cpp/build/

# Gradle
.gradle

# Log
*.log
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "tubemq-client-twins/tubemq-client-cpp/third_party/rapidjson"]
path = tubemq-client-twins/tubemq-client-cpp/third_party/rapidjson
[submodule "inlong-tubemq/tubemq-client-twins/tubemq-client-cpp/third_party/rapidjson"]
path = inlong-tubemq/tubemq-client-twins/tubemq-client-cpp/third_party/rapidjson
url = https://github.com/Tencent/rapidjson.git
tag = v1.1.0
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jdk:
- openjdk8

before_cache:
- rm -rf $HOME/.m2/repository/org/apache/tubemq/
- rm -rf $HOME/.m2/repository/org/apache/inlong/

cache:
directories:
Expand Down
642 changes: 321 additions & 321 deletions CHANGES.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions DISCLAIMER-WIP
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Apache TubeMQ is an effort undergoing incubation at The Apache Software Foundation (ASF),
Apache InLong is an effort undergoing incubation at The Apache Software Foundation (ASF),
sponsored by the Apache Incubator. Incubation is required of all newly accepted projects
until a further review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other successful ASF projects.
Expand All @@ -15,4 +15,4 @@ is likely to be incomplete):
If you are planning to incorporate this work into your product/project, please be aware that
you will need to conduct a thorough licensing review to determine the overall implications of
including this work. For the current status of this project through the Apache Incubator
visit: https://incubator.apache.org/projects/tubemq.html
visit: https://incubator.apache.org/projects/inlong.html
44 changes: 24 additions & 20 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
1.1 Third party MIT license licenses
=========

1.1.1 resources/assets/lib/jquery.min.js
1.1.1 inlong-tubemq/resources/assets/lib/jquery.min.js
Source : jquery 1.11.3
License : https://github.com/jquery/jquery/blob/1.11.3/MIT-LICENSE.txt
| Copyright 2014 jQuery Foundation and other contributors
Expand All @@ -237,7 +237,7 @@

----

1.1.2 resources/assets/lib/DataTables/*
1.1.2 inlong-tubemq/resources/assets/lib/DataTables/*
Source : datatables 1.10.7
License : https://github.com/DataTables/DataTables/blob/1.10.7/license.txt
| Copyright (c) 2008-2013 SpryMedia Limited
Expand All @@ -263,8 +263,8 @@

----

1.1.3 resources/assets/public/css/style.css
resources/assets/public/css/ie.css
1.1.3 inlong-tubemq/resources/assets/public/css/style.css
inlong-tubemq/resources/assets/public/css/ie.css
Source : Compass
License : https://github.com/Compass/compass/blob/stable/LICENSE.markdown
| Copyright (c) 2009-2014 Christopher M. Eppstein
Expand All @@ -285,8 +285,8 @@
1.2 Third party BSD 3-Clause license
=========

1.2.1 tubemq-client-twins/tubemq-client-cpp/src/any.h
tubemq-client-twins/tubemq-client-cpp/src/buffer.h
1.2.1 inlong-tubemq/tubemq-client-twins/tubemq-client-cpp/src/any.h
inlong-tubemq/tubemq-client-twins/tubemq-client-cpp/src/buffer.h
Source : https://github.com/Qihoo360/evpp/blob/master/evpp/any.h version c5038a6
https://github.com/Qihoo360/evpp/blob/master/evpp/buffer.h version b2535d7
License : https://github.com/Qihoo360/evpp/blob/master/LICENSE
Expand Down Expand Up @@ -326,28 +326,32 @@
1.3 Third party Apache 2.0 Licenses
=========

1.3.1 tubemq-server/src/main/java/org/apache/tubemq/server/common/utils/Bytes.java
tubemq-server/src/main/java/org/apache/tubemq/server/common/utils/HashedBytes.java
tubemq-server/src/main/java/org/apache/tubemq/server/common/utils/HasThread.java
tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/RecoverableZooKeeper.java
tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/ZooKeeperWatcher.java
tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/ZooKeeperListener.java
tubemq-core/src/main/java/org/apache/tubemq/corebase/utils/ThreadUtils.java
tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/ZooKeeperConnectionException.java
tubemq-server/src/main/java/org/apache/tubemq/server/master/utils/Chore.java
tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/ZKUtil.java
tubemq-server/src/main/java/org/apache/tubemq/server/common/utils/RowLock.java
1.3.1 inlong-tubemq/tubemq-server/src/main/java/org/apache/tubemq/server/common/utils/Bytes.java
inlong-tubemq/tubemq-server/src/main/java/org/apache/tubemq/server/common/utils/HashedBytes.java
inlong-tubemq/tubemq-server/src/main/java/org/apache/tubemq/server/common/utils/HasThread.java
inlong-tubemq/tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/RecoverableZooKeeper.java
inlong-tubemq/tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/ZooKeeperWatcher.java
inlong-tubemq/tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/ZooKeeperListener.java
inlong-tubemq/tubemq-core/src/main/java/org/apache/tubemq/corebase/utils/ThreadUtils.java
inlong-tubemq/tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/ZooKeeperConnectionException.java
inlong-tubemq/tubemq-server/src/main/java/org/apache/tubemq/server/master/utils/Chore.java
inlong-tubemq/tubemq-server/src/main/java/org/apache/tubemq/server/common/offsetstorage/zookeeper/ZKUtil.java
inlong-tubemq/tubemq-server/src/main/java/org/apache/tubemq/server/common/utils/RowLock.java
Source : hbase 0.94.27 (Please note that the software have been modified.)
License : https://github.com/apache/hbase/blob/rel/0.94.27/LICENSE.txt

1.3.2 tubemq-core/src/main/java/org/apache/tubemq/corerpc/netty/ByteBufferInputStream.java
tubemq-core/src/main/java/org/apache/tubemq/corerpc/netty/ByteBufferOutputStream.java
1.3.2 inlong-tubemq/tubemq-core/src/main/java/org/apache/tubemq/corerpc/netty/ByteBufferInputStream.java
inlong-tubemq/tubemq-core/src/main/java/org/apache/tubemq/corerpc/netty/ByteBufferOutputStream.java
Source : Apache Avro 1.7.6
License : https://github.com/apache/avro/blob/release-1.7.6/LICENSE.txt

1.3.3 tubemq-client-twins/tubemq-client-cpp/src/future.h
1.3.3 inlong-tubemq/tubemq-client-twins/tubemq-client-cpp/src/future.h
Source : Apache Pulsar
License : https://github.com/apache/pulsar/blob/master/LICENSE

1.3.4 codestyle/checkstyle.xml
Source :checkstyle 8.44 (Modified from src/main/resources/google_checks.xml)
License : https://github.com/checkstyle/checkstyle/blob/master/LICENSE.apache20

----

Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Apache TubeMQ
Apache InLong
Copyright 2019-2021 The Apache Software Foundation.

This product includes software developed at
Expand Down
Loading

0 comments on commit 4b22232

Please sign in to comment.