Merge pull request #47 from BCDA-APS/46-EPICS-license

Apply EPICS Open License
BCDA-APS · Nov 28, 2022 · 851004a · 851004a
2 parents 4a80aaa + c1f6508
commit 851004a
Show file tree

Hide file tree

Showing 26 changed files with 105 additions and 73 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -23,6 +23,16 @@ describe the future plans.
 
    release expected by TBA
 
+2021.0.1
+************
+
+released expected by 2022-11-30
+
+Maintenance
+-----------
+
+* Apply *EPICS Open License*.
+
 2021.0.0
 ************
 

diff --git a/README.rst b/README.rst
@@ -13,8 +13,8 @@ script for automated startup in a cron task or at system startup.
 
 :author: 	Pete R. Jemian
 :email:  	[email protected]
-:copyright: 2005-2022, UChicago Argonne, LLC
-:license:   ANL OPEN SOURCE LICENSE (see *LICENSE*)
+:copyright: 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
+:license:   EPICS (see *LICENSE*)
 :docs:      https://bcda-aps.github.io/pvWebMonitor/
 :git:       https://github.com/BCDA-APS/pvWebMonitor.git
 :PyPI:      https://pypi.python.org/pypi/pvWebMonitor
@@ -32,3 +32,4 @@ script for automated startup in a cron task or at system startup.
 :review:
    .. image:: https://app.codacy.com/project/badge/Grade/ee4a888d573247afb54c1f6f53d503bd    
       :target: https://www.codacy.com/manual/BCDA-APS/pvWebMonitor/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=prjemian/pvWebMonitor&amp;utm_campaign=Badge_Grade
+
diff --git a/docs/source/example/index.xsl b/docs/source/example/index.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
  -->
 

diff --git a/docs/source/example/livedata.xsl b/docs/source/example/livedata.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
  -->
 

diff --git a/docs/source/example/pvlist.xsl b/docs/source/example/pvlist.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
  -->
 <xsl:stylesheet 

diff --git a/docs/source/example/rawdata.xsl b/docs/source/example/rawdata.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
  -->
 <xsl:stylesheet 

diff --git a/docs/source/example/www/index.xsl b/docs/source/example/www/index.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
  -->
 

diff --git a/docs/source/example/www/livedata.xsl b/docs/source/example/www/livedata.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
  -->
 

diff --git a/docs/source/example/www/pvlist.xsl b/docs/source/example/www/pvlist.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
  -->
 <xsl:stylesheet 

diff --git a/docs/source/example/www/rawdata.xsl b/docs/source/example/www/rawdata.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
  -->
 <xsl:stylesheet 

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
 
 

diff --git a/src/pvWebMonitor/LICENSE b/src/pvWebMonitor/LICENSE
@@ -1,48 +1,69 @@
-Copyright (c) 2005-2022, UChicago Argonne, LLC
+Copyright (c) 2002-2022 University of Chicago, The Regents of the
+University of California, and Berliner Elektronenspeicherring
+Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights
+reserved.
+
+
+pvWebMonitor is distributed subject to the following license conditions:
+
+ SOFTWARE LICENSE AGREEMENT
+ Software: pvWebMonitor
+
+ 1. The "Software", below, refers to pvWebMonitor (in either source code, or
+    binary form and accompanying documentation). Each licensee is
+    addressed as "you" or "Licensee."
+
+ 2. The copyright holders shown above and their third-party licensors
+    hereby grant Licensee a royalty-free nonexclusive license, subject to
+    the limitations stated herein and U.S. Government license rights.
+
+ 3. You may modify and make a copy or copies of the Software for use
+    within your organization, if you meet the following conditions:
+      a. Copies in source code must include the copyright notice and this
+         Software License Agreement.
+      b. Copies in binary form must include the copyright notice and this
+         Software License Agreement in the documentation and/or other
+         materials provided with the copy.
+
+ 4. You may modify a copy or copies of the Software or any portion of it,
+    thus forming a work based on the Software, and distribute copies of
+    such work outside your organization, if you meet all of the following
+    conditions:
+      a. Copies in source code must include the copyright notice and this
+         Software License Agreement;
+      b. Copies in binary form must include the copyright notice and this
+         Software License Agreement in the documentation and/or other
+         materials provided with the copy;
+      c. Modified copies and works based on the Software must carry
+         prominent notices stating that you changed specified portions of
+         the Software.
+
+ 5. Portions of the Software resulted from work developed under a U.S.
+    Government contract and are subject to the following license: the
+    Government is granted for itself and others acting on its behalf a
+    paid-up, nonexclusive, irrevocable worldwide license in this computer
+    software to reproduce, prepare derivative works, and perform publicly
+    and display publicly.
+
+ 6. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT WARRANTY
+    OF ANY KIND. THE COPYRIGHT HOLDERS, THEIR THIRD PARTY LICENSORS, THE
+    UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND THEIR
+    EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+    BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+    FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT, (2) DO NOT ASSUME
+    ANY LEGAL LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS,
+    OR USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF THE
+    SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4) DO NOT WARRANT
+    THAT THE SOFTWARE WILL FUNCTION UNINTERRUPTED, THAT IT IS ERROR-FREE
+    OR THAT ANY ERRORS WILL BE CORRECTED.
+
+ 7. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT HOLDERS, THEIR
+    THIRD PARTY LICENSORS, THE UNITED STATES, THE UNITED STATES DEPARTMENT
+    OF ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, INCIDENTAL,
+    CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF ANY KIND OR NATURE,
+    INCLUDING BUT NOT LIMITED TO LOSS OF PROFITS OR LOSS OF DATA, FOR ANY
+    REASON WHATSOEVER, WHETHER SUCH LIABILITY IS ASSERTED ON THE BASIS OF
+    CONTRACT, TORT (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR
+    OTHERWISE, EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE
+    POSSIBILITY OF SUCH LOSS OR DAMAGES.
 
-All Rights Reserved
-
-pvWebMonitor
-
-Advanced Photon Source, Argonne National Laboratory
-
-
-OPEN SOURCE LICENSE
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, 
-   this list of conditions and the following disclaimer.  Software changes, 
-   modifications, or derivative works, should be noted with comments and 
-   the author and organization's name.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation 
-   and/or other materials provided with the distribution.
-
-3. Neither the names of UChicago Argonne, LLC or the Department of Energy 
-   nor the names of its contributors may be used to endorse or promote 
-   products derived from this software without specific prior written 
-   permission.
-
-4. The software and the end-user documentation included with the 
-   redistribution, if any, must include the following acknowledgment:
-
-   "This product includes software produced by UChicago Argonne, LLC 
-   under Contract No. DE-AC02-06CH11357 with the Department of Energy."
-
-****************************************************************************
-
-DISCLAIMER
-
-THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT WARRANTY OF ANY KIND.
-
-Neither the United States GOVERNMENT, nor the United States Department 
-of Energy, NOR UChicago Argonne, LLC, nor any of their employees, makes 
-any warranty, express or implied, or assumes any legal liability or 
-responsibility for the accuracy, completeness, or usefulness of any 
-information, data, apparatus, product, or process disclosed, or 
-represents that its use would not infringe privately owned rights.
-
-****************************************************************************
diff --git a/src/pvWebMonitor/__init__.py b/src/pvWebMonitor/__init__.py
@@ -11,9 +11,9 @@
 __author_name__ = __author__
 __author_email__ = __email__
 
-__copyright__ = "2005-2022, UChicago Argonne, LLC"
+__copyright__ = "2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved."
 # __license_url__         = u''
-__license__ = "UChicago Argonne, LLC OPEN SOURCE LICENSE (see LICENSE file)"
+__license__ = "EPICS Open License (see LICENSE file)"
 __url__ = "https://bcda-aps.github.io/pvWebMonitor/"
 __download_url__ = "https://github.com/prjemian/pvWebMonitor.git"
 __keywords__ = ["EPICS", "PV", "tool", "HTML"]

diff --git a/src/pvWebMonitor/config_1_0.xsd b/src/pvWebMonitor/config_1_0.xsd
@@ -2,7 +2,7 @@
 <!-- 
 XML Schema to validate the config.xml file
 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
  -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">

diff --git a/src/pvWebMonitor/config_1_0_1.xsd b/src/pvWebMonitor/config_1_0_1.xsd
@@ -2,7 +2,7 @@
 <!-- 
 XML Schema to validate the config.xml file
 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
  -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">

diff --git a/src/pvWebMonitor/dev_main.py b/src/pvWebMonitor/dev_main.py
@@ -4,7 +4,7 @@
 pvWebMonitor.dev_main
 """
 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
 
 

diff --git a/src/pvWebMonitor/main.py b/src/pvWebMonitor/main.py
@@ -35,7 +35,7 @@
 
 """
 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
 
 

diff --git a/src/pvWebMonitor/project/index.xsl b/src/pvWebMonitor/project/index.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
  -->
 

diff --git a/src/pvWebMonitor/project/livedata.xsl b/src/pvWebMonitor/project/livedata.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
  -->
 

diff --git a/src/pvWebMonitor/project/pvlist.xsl b/src/pvWebMonitor/project/pvlist.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
  -->
 <xsl:stylesheet 

diff --git a/src/pvWebMonitor/project/rawdata.xsl b/src/pvWebMonitor/project/rawdata.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
  -->
 <xsl:stylesheet 

diff --git a/src/pvWebMonitor/pvlist.xsd b/src/pvWebMonitor/pvlist.xsd
@@ -2,7 +2,7 @@
 <!-- 
 XML Schema to validate the pvlist.xml file
 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
  -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">

diff --git a/src/pvWebMonitor/pvwatch.py b/src/pvWebMonitor/pvwatch.py
@@ -2,7 +2,7 @@
 pvWebMonitor.pvwatch
 """
 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
 
 

diff --git a/src/pvWebMonitor/read_config.py b/src/pvWebMonitor/read_config.py
@@ -4,7 +4,7 @@
 Read XML configuration file for ``pvWebMonitor`` package.
 """
 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
 
 

diff --git a/src/pvWebMonitor/setup.py b/src/pvWebMonitor/setup.py
@@ -2,7 +2,7 @@
 setup a new project directory
 """
 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.
 
 

diff --git a/src/pvWebMonitor/utils.py b/src/pvWebMonitor/utils.py
@@ -2,7 +2,7 @@
 pvWebMonitor.utils
 """
 
-# Copyright (c) 2005-2022, UChicago Argonne, LLC.
+# Copyright (c) 2005-2022, University of Chicago, The Regents of the University of California, and Berliner Elektronenspeicherring Gesellschaft fuer Synchrotronstrahlung m.b.H. (BESSY) All rights reserved.
 # See LICENSE file for details.