Browse Source

update license info

Nikolay Suslov 5 years ago
parent
commit
7c78dca2f0
10 changed files with 76 additions and 35 deletions
  1. 3 6
      LICENSE.md
  2. 27 4
      README.md
  3. 0 13
      VWF_LICENSE.md
  4. 4 2
      index.js
  5. 6 3
      lib/reflector.js
  6. 9 0
      licenses/LICENSE_ADL_Sandbox.md
  7. 11 0
      licenses/LICENSE_VWF.md
  8. 7 3
      node_vwf.js
  9. 4 2
      server/logger.js
  10. 5 2
      server/readConfig.js

+ 3 - 6
LICENSE.md

@@ -1,6 +1,6 @@
-Krestianstvo.org
 The MIT License (MIT)
-Copyright (c) 2018 Nikolai Suslov
+
+Copyright (c) 2014-2018 Nikolai Suslov and the Krestianstvo.org project contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,7 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------
-A different license may apply to other software included in this package. Please consult their respective license files for the terms of their individual licenses.
+SOFTWARE.

+ 27 - 4
README.md

@@ -3,10 +3,33 @@
 Standalone message reflector for LiveCoding.space application (base on VWF reflector)  
 Live at [https://time.livecoding.space](https://time.livecoding.space)
 
-
 ## Contributing
 
-All code is published under the [MIT license](https://github.com/NikolaySuslov/lcs-reflector/blob/master/LICENSE.md)
+All code is published under the MIT license
+
+Copyright (c) 2014-2018 Nikolai Suslov and the Krestianstvo.org project contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+----
 
-A different license may apply to other software included in this package. Please consult their respective license files for the terms of their individual licenses:     
-[VWF Apache License](https://github.com/NikolaySuslov/lcs-reflector/blob/master/VWF_LICENSE.md)
+A different license may apply to other software included in this package. Please consult their respective license files for the terms of their individual licenses.   
+[VWF Apache 2.0 License](https://github.com/NikolaySuslov/lcs-reflector/blob/master/licenses/LICENSE_VWF.md)  
+  
+[ADL VW Sandbox Apache 2.0 License](https://github.com/NikolaySuslov/lcs-reflector/blob/master/licenses/LICENSE_ADL_Sandbox.md)

+ 0 - 13
VWF_LICENSE.md

@@ -1,13 +0,0 @@
-Virtual World Framework
-Copyright 2012 United States Government, as represented by the Secretary of Defense, Under
-Secretary of Defense (Personnel & Readiness).
-
-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.

+ 4 - 2
index.js

@@ -1,5 +1,7 @@
-// Copyright (c) 2018 Nikolai Suslov
-// Krestianstvo.org MIT license (https://github.com/NikolaySuslov/lcs-reflector/blob/master/LICENSE.md)
+/*
+The MIT License (MIT)
+Copyright (c) 2014-2018 Nikolai Suslov and the Krestianstvo.org project contributors. (https://github.com/NikolaySuslov/lcs-reflector/blob/master/LICENSE.md)
+*/
 
 var reflector = require('./lib/reflector')
 module.exports = reflector

+ 6 - 3
lib/reflector.js

@@ -1,6 +1,9 @@
-// Copyright (c) 2018 Nikolai Suslov
-// Krestianstvo.org MIT license (https://github.com/NikolaySuslov/lcs-reflector/blob/master/LICENSE.md)
-// VWF Apache License (https://github.com/NikolaySuslov/lcs-reflector/blob/master/VWF_LICENSE.md)
+/*
+The MIT License (MIT)
+Copyright (c) 2014-2018 Nikolai Suslov and the Krestianstvo.org project contributors. (https://github.com/NikolaySuslov/lcs-reflector/blob/master/LICENSE.md)
+
+Virtual World Framework Apache 2.0 license  (https://github.com/NikolaySuslov/lcs-reflector/blob/master/licenses/LICENSE_VWF.md)
+*/
 
 "use strict";
 

+ 9 - 0
licenses/LICENSE_ADL_Sandbox.md

@@ -0,0 +1,9 @@
+ADL VW Sandbox  
+Copyright (c) 2016 Advanced Distributed Learning
+
+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
+Apache License, Version 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.

+ 11 - 0
licenses/LICENSE_VWF.md

@@ -0,0 +1,11 @@
+Virtual World Framework  
+Copyright (c) 2012 United States Government, as represented by the Secretary of Defense, Under Secretary of Defense (Personnel & Readiness).
+
+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.

+ 7 - 3
node_vwf.js

@@ -1,6 +1,10 @@
-// Copyright (c) 2018 Nikolai Suslov
-// Krestianstvo.org MIT license (https://github.com/NikolaySuslov/lcs-reflector/blob/master/LICENSE.md)
-// VWF Apache License (https://github.com/NikolaySuslov/lcs-reflector/blob/master/VWF_LICENSE.md)
+/*
+The MIT License (MIT)
+Copyright (c) 2014-2018 Nikolai Suslov and the Krestianstvo.org project contributors. (https://github.com/NikolaySuslov/lcs-reflector/blob/master/LICENSE.md)
+
+Virtual World Framework Apache 2.0 license  (https://github.com/NikolaySuslov/lcs-reflector/blob/master/licenses/LICENSE_VWF.md)
+*/
+
 
 var http = require('http'),
     https = require('https'),

+ 4 - 2
server/logger.js

@@ -1,5 +1,7 @@
-// Copyright (c) 2018 Nikolai Suslov
-// Krestianstvo.org MIT license (https://github.com/NikolaySuslov/lcs-reflector/blob/master/LICENSE.md)
+/*
+The MIT License (MIT)
+Copyright (c) 2014-2018 Nikolai Suslov and the Krestianstvo.org project contributors. (https://github.com/NikolaySuslov/lcs-reflector/blob/master/LICENSE.md)
+*/
 
 var winston = require('winston');
 

+ 5 - 2
server/readConfig.js

@@ -1,5 +1,8 @@
-// Copyright (c) 2018 Nikolai Suslov
-// Krestianstvo.org MIT license (https://github.com/NikolaySuslov/lcs-reflector/blob/master/LICENSE.md)
+/*
+The MIT License (MIT)
+Copyright (c) 2014-2018 Nikolai Suslov and the Krestianstvo.org project contributors. (https://github.com/NikolaySuslov/lcs-reflector/blob/master/LICENSE.md)  
+ADL VW Sandbox Apache 2.0 license(https://github.com/NikolaySuslov/lcs-reflector/blob/master/licenses/LICENSE_ADL_Sandbox.md)
+*/
 
 var fs = require('fs'),
     argv = require('optimist').argv,