From 42cda5eac5e33354eb74ef25dd7a51937c9b32b5 Mon Sep 17 00:00:00 2001 From: Gen TANG Date: Fri, 5 Jun 2020 18:39:37 +0800 Subject: [PATCH] Return to Apache license for dendrite work (#28) * change license for dendrite work * typo in gitignore --- .gitignore | 2 +- appservice/consumers/roomserver.go | 23 +++++++++-------- common/httpapi.go | 23 +++++++++-------- .../fedsender/queue/destinationqueue.go | 23 +++++++++-------- federation/fedsender/queue/queue.go | 23 +++++++++-------- model/authtypes/logintypes.go | 25 +++++++++++-------- 6 files changed, 67 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index c2d2f3d0..03d96f9b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,5 +16,5 @@ bin .vscode -log +./log .DS_Store diff --git a/appservice/consumers/roomserver.go b/appservice/consumers/roomserver.go index c807fdc6..c0de602c 100644 --- a/appservice/consumers/roomserver.go +++ b/appservice/consumers/roomserver.go @@ -1,16 +1,19 @@ -// Copyright (C) 2020 Finogeeks Co., Ltd +// Copyright 2017 Vector Creations Ltd // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License, version 3, -// as published by the Free Software Foundation. +// 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 // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. +// http://www.apache.org/licenses/LICENSE-2.0 // -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . +// 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. +// +// +// Modifications copyright (C) 2020 Finogeeks Co., Ltd package consumers diff --git a/common/httpapi.go b/common/httpapi.go index 85cfbf4c..bf48a5ec 100644 --- a/common/httpapi.go +++ b/common/httpapi.go @@ -1,16 +1,19 @@ -// Copyright (C) 2020 Finogeeks Co., Ltd +// Copyright 2017 Vector Creations Ltd // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License, version 3, -// as published by the Free Software Foundation. +// 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 // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. +// http://www.apache.org/licenses/LICENSE-2.0 // -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . +// 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. +// +// +// Modifications copyright (C) 2020 Finogeeks Co., Ltd package common diff --git a/federation/fedsender/queue/destinationqueue.go b/federation/fedsender/queue/destinationqueue.go index 11180f67..7d6cd1a1 100644 --- a/federation/fedsender/queue/destinationqueue.go +++ b/federation/fedsender/queue/destinationqueue.go @@ -1,16 +1,19 @@ -// Copyright (C) 2020 Finogeeks Co., Ltd +// Copyright 2017 Vector Creations Ltd // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License, version 3, -// as published by the Free Software Foundation. +// 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 // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. +// http://www.apache.org/licenses/LICENSE-2.0 // -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . +// 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. +// +// +// Modifications copyright (C) 2020 Finogeeks Co., Ltd package queue diff --git a/federation/fedsender/queue/queue.go b/federation/fedsender/queue/queue.go index d8723155..f7ef9ceb 100644 --- a/federation/fedsender/queue/queue.go +++ b/federation/fedsender/queue/queue.go @@ -1,16 +1,19 @@ -// Copyright (C) 2020 Finogeeks Co., Ltd +// Copyright 2017 Vector Creations Ltd // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License, version 3, -// as published by the Free Software Foundation. +// 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 // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. +// http://www.apache.org/licenses/LICENSE-2.0 // -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . +// 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. +// +// +// Modifications copyright (C) 2020 Finogeeks Co., Ltd package queue diff --git a/model/authtypes/logintypes.go b/model/authtypes/logintypes.go index dd1e70b9..7e3c68d6 100644 --- a/model/authtypes/logintypes.go +++ b/model/authtypes/logintypes.go @@ -1,20 +1,23 @@ -// Copyright (C) 2020 Finogeeks Co., Ltd +// Copyright 2017 Vector Creations Ltd // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License, version 3, -// as published by the Free Software Foundation. +// 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 // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. +// http://www.apache.org/licenses/LICENSE-2.0 // -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . +// 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. +// +// +// Modifications copyright (C) 2020 Finogeeks Co., Ltd package authtypes -// The relevant login types implemented in Dendrite +// The relevant login types implemented in Ligase const ( LoginTypeDummy = "m.login.dummy" LoginTypeSharedSecret = "org.matrix.login.shared_secret" -- GitLab