License and copyright

Replaced references to "EPICS pvData" and "EPICS JavaIOC" with "this software" in per-file copyright notice - consistent with other files. Add BNL and DLS to copyright and legal disclaimers.
2015-09-04 09:24:54 +01:00
parent e5947aa0a2
commit 16b46448c0
24 changed files with 66 additions and 28 deletions
--- a/8
+++ b/8
@@ -15,7 +15,7 @@ provided on an "as is" basis, and the copyright holders have no
 obligation either collectively or individually to provide maintenance,
 support, updates, enhancements, or modifications.

-Copyright (c) 2006 - 2015
+Copyright (c) 2006 - 2015 All rights reserved

 Martin R. Kraimer
 The University of Chicago, as Operator of Argonne National Laboratory.
@@ -23,7 +23,9 @@ Deutsches Elektronen-Synchroton, Member of the Helmholtz Association,
    (DESY), HAMBURG, GERMANY,
 BERLINER SPEICHERRING GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H.
    (BESSY), BERLIN, GERMANY.
-COSYLAB (Control System Laboratory), Ljubljana Slovenia
+COSYLAB (Control System Laboratory), Ljubljana, Slovenia.
 Brookhaven Science Associates, as Operator of Brookhaven
    National Laboratory.
-Diamond Light Source Ltd.
+Diamond Light Source Ltd., Didcot, United Kingdom.
+
+
--- a/42
+++ b/42
@@ -1,12 +1,15 @@

-Copyright (c) 2008 Martin R. Kraimer
+Copyright (c) 2006-2015 Martin R. Kraimer
 Copyright (c) 2006 The University of Chicago, as Operator of Argonne
     National Laboratory.
 Copyright (c) 2006 Deutsches Elektronen-Synchrotron,
     Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY.
-Copyright (c) 2007 Control System Laboratory,
+Copyright (c) 2007-2015 Control System Laboratory,
    (COSYLAB) Ljubljana Slovenia
-
+Copyright (c) 2010-2015 Brookhaven Science Associates, as Operator of Brookhaven
+    National Laboratory
+Copyright (c) 2011-2015 Diamond Light Source Limited,
+    (DLS) Didcot, United Kingdom

 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ -75,4 +78,37 @@ to, the implied warranties of merchantability, fitness for a particular
 purpose, and non-infringement.  This software is provided on an "as is"
 basis, and DESY has no obligation to provide maintenance, support,
 updates, enhancements, or modifications.
+
+______________________________________________________________________
+
+This software is in part copyrighted by the Brookhaven
+    National Laboratory (BNL).
+
+In no event shall BNL be liable to any party for direct, indirect,
+special, incidental, or consequential damages arising out of the use of
+this software, its documentation, or any derivatives thereof, even if
+BNL has been advised of the possibility of such damage.
+
+BNL specifically disclaims any warranties, including, but not limited
+to, the implied warranties of merchantability, fitness for a particular
+purpose, and non-infringement.  This software is provided on an "as is"
+basis, and BNL has no obligation to provide maintenance, support,
+updates, enhancements, or modifications.
+
 ________________________________________________________________________
+
+This software is in part copyrighted by Diamond Light Source Limited (DLS)
+
+In no event shall DLS be liable to any party for direct, indirect,
+special, incidental, or consequential damages arising out of the use of
+this software, its documentation, or any derivatives thereof, even if
+DLS has been advised of the possibility of such damage.
+
+DLS specifically disclaims any warranties, including, but not limited
+to, the implied warranties of merchantability, fitness for a particular
+purpose, and non-infringement.  This software is provided on an "as is"
+basis, and DLS has no obligation to provide maintenance, support,
+updates, enhancements, or modifications.
+
+________________________________________________________________________
+
--- a/src/nt/ntaggregate.cpp
+++ b/src/nt/ntaggregate.cpp
@@ -1,7 +1,7 @@
 /* ntaggregate.cpp */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */

--- a/src/nt/ntaggregate.h
+++ b/src/nt/ntaggregate.h
@@ -1,7 +1,7 @@
 /* ntaggregate.h */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */
 #ifndef NTAGGREGATE_H
--- a/src/nt/ntattribute.cpp
+++ b/src/nt/ntattribute.cpp
@@ -1,7 +1,7 @@
 /* ntattribute.cpp */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */

--- a/src/nt/ntattribute.h
+++ b/src/nt/ntattribute.h
@@ -1,7 +1,7 @@
 /* ntattribute.h */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */
 #ifndef NTATTRIBUTE_H
--- a/src/nt/ntcontinuum.cpp
+++ b/src/nt/ntcontinuum.cpp
@@ -1,7 +1,7 @@
 /* ntcontinuum.cpp */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */

--- a/src/nt/ntcontinuum.h
+++ b/src/nt/ntcontinuum.h
@@ -1,7 +1,7 @@
 /* ntcontinuum.h */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */
 #ifndef NTCONTINUUM_H
--- a/src/nt/ntenum.cpp
+++ b/src/nt/ntenum.cpp
@@ -1,7 +1,7 @@
 /* ntenum.cpp */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */

--- a/src/nt/ntenum.h
+++ b/src/nt/ntenum.h
@@ -1,7 +1,7 @@
 /* ntenum.h */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */
 #ifndef NTENUM_H
--- a/src/nt/nthistogram.cpp
+++ b/src/nt/nthistogram.cpp
@@ -1,7 +1,7 @@
 /* ntcontinuum.cpp */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */

--- a/src/nt/nthistogram.h
+++ b/src/nt/nthistogram.h
@@ -1,7 +1,7 @@
 /* nthistogram.h */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */
 #ifndef NTHISTOGRAM_H
--- a/src/nt/ntid.cpp
+++ b/src/nt/ntid.cpp
@@ -1,6 +1,6 @@
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS JavaIOC is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */

--- a/src/nt/ntid.h
+++ b/src/nt/ntid.h
@@ -1,6 +1,6 @@
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS JavaIOC is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */
 #ifndef NTID_H
--- a/src/nt/ntmatrix.cpp
+++ b/src/nt/ntmatrix.cpp
@@ -1,7 +1,7 @@
 /* ntmatrix.cpp */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */

--- a/src/nt/ntmatrix.h
+++ b/src/nt/ntmatrix.h
@@ -1,7 +1,7 @@
 /* ntmatrix.h */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */
 #ifndef NTMATRIX_H
--- a/src/nt/ntndarrayAttribute.cpp
+++ b/src/nt/ntndarrayAttribute.cpp
@@ -1,7 +1,7 @@
 /* ntndarrayAttribute.cpp */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */

--- a/src/nt/ntndarrayAttribute.h
+++ b/src/nt/ntndarrayAttribute.h
@@ -1,7 +1,7 @@
 /* ntndarrayAttribute.h */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */
 #ifndef NTNDARRAYATTRIBUTE_H
--- a/src/nt/ntscalarMultiChannel.cpp
+++ b/src/nt/ntscalarMultiChannel.cpp
@@ -1,7 +1,7 @@
 /* ntscalarMultiChannel.cpp */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */

--- a/src/nt/ntscalarMultiChannel.h
+++ b/src/nt/ntscalarMultiChannel.h
@@ -1,7 +1,7 @@
 /* ntscalarMultiChannel.h */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */
 #ifndef NTSCALARMULTICHANNEL_H
--- a/src/nt/ntunion.cpp
+++ b/src/nt/ntunion.cpp
@@ -1,7 +1,7 @@
 /* ntunion.cpp */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */

--- a/src/nt/ntunion.h
+++ b/src/nt/ntunion.h
@@ -1,7 +1,7 @@
 /* ntunion.h */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */
 #ifndef NTUNION_H
--- a/src/nt/nturi.cpp
+++ b/src/nt/nturi.cpp
@@ -1,7 +1,7 @@
 /* nturi.cpp */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */

--- a/src/nt/nturi.h
+++ b/src/nt/nturi.h
@@ -1,7 +1,7 @@
 /* nturi.h */
 /**
 * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * This software is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 */
 #ifndef NTURI_H