diff --git a/ocaml/sdk-gen/LICENSE b/ocaml/sdk-gen/LICENSE
index 634d6890be7..5655ce76f9b 100644
--- a/ocaml/sdk-gen/LICENSE
+++ b/ocaml/sdk-gen/LICENSE
@@ -1,5 +1,4 @@
-Copyright (c) Citrix Systems, Inc.
-All rights reserved.
+Copyright (c) Cloud Software Group, Inc.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
diff --git a/ocaml/sdk-gen/README.md b/ocaml/sdk-gen/README.md
index 93c75e09193..5185a9cd71f 100644
--- a/ocaml/sdk-gen/README.md
+++ b/ocaml/sdk-gen/README.md
@@ -16,7 +16,7 @@ README files. The (patched) third party libraries required for the compilation
of the C# and PowerShell source code can be obtained from
[xenserver/dotnet-packages](https://github.com/xenserver/dotnet-packages)
-The repository [xenserver-samples](https://github.com/xenserver/xenserver-samples)
+The repository [xenserver/xenserver-samples](https://github.com/xenserver/xenserver-samples)
contains a number of examples for each of the five programming languages to help
you get started with the SDK.
diff --git a/ocaml/sdk-gen/c/README.dist b/ocaml/sdk-gen/c/README.dist
index 897eeb344a7..9c070aa56f1 100644
--- a/ocaml/sdk-gen/c/README.dist
+++ b/ocaml/sdk-gen/c/README.dist
@@ -1,8 +1,10 @@
libxenserver
============
-libxenserver is a complete SDK for Citrix Hypervisor exposing the Citrix
-Hypervisor API to C developers.
+Copyright (c) 2007-2023 Cloud Software Group, Inc. All Rights Reserved.
+
+libxenserver is a complete SDK for XenServer exposing the XenServer API to
+C developers.
libxenserver includes a C function call for each API call, so API
documentation and examples written for for other languages can be easily
@@ -12,16 +14,15 @@ for developers wishing to use libxenserver.
libxenserver is free software. You can redistribute and modify it under the
terms of the BSD 2-Clause license. See COPYING for details.
-
Reference
---------
-For Citrix Hypervisor documentation see https://docs.citrix.com/en-us/citrix-hypervisor/
+For XenServer documentation see https://docs.citrix.com/en-us/citrix-hypervisor/
-The Citrix Hypervisor Management API Reference is available at
+The XenServer Management API Reference is available at
https://developer-docs.citrix.com/projects/citrix-hypervisor-management-api/en/latest/
-The Citrix Hypervisor Software Development Kit Guide is available at
+The XenServer Software Development Kit Guide is available at
https://developer-docs.citrix.com/projects/citrix-hypervisor-sdk/en/latest/
A number of examples to help you get started with the SDK is available at
@@ -30,7 +31,7 @@ https://github.com/xenserver/xenserver-samples
For community content, blogs, and downloads, visit
https://www.citrix.com/community/citrix-developer/
-To network with other developers using Citrix Hypervisor visit
+To network with other developers using XenServer visit
https://discussions.citrix.com/forum/101-hypervisor-formerly-xenserver/
diff --git a/ocaml/sdk-gen/c/autogen/include/xen/api/xen_common.h b/ocaml/sdk-gen/c/autogen/include/xen/api/xen_common.h
index 43882a5d7b1..826afa148ec 100644
--- a/ocaml/sdk-gen/c/autogen/include/xen/api/xen_common.h
+++ b/ocaml/sdk-gen/c/autogen/include/xen/api/xen_common.h
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/c/autogen/include/xen/api/xen_event_batch.h b/ocaml/sdk-gen/c/autogen/include/xen/api/xen_event_batch.h
index c720b29a56c..4a160bfac8f 100644
--- a/ocaml/sdk-gen/c/autogen/include/xen/api/xen_event_batch.h
+++ b/ocaml/sdk-gen/c/autogen/include/xen/api/xen_event_batch.h
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/c/autogen/include/xen/api/xen_int_set.h b/ocaml/sdk-gen/c/autogen/include/xen/api/xen_int_set.h
index f84147822a4..97138fffe61 100644
--- a/ocaml/sdk-gen/c/autogen/include/xen/api/xen_int_set.h
+++ b/ocaml/sdk-gen/c/autogen/include/xen/api/xen_int_set.h
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/c/autogen/include/xen/api/xen_string_set.h b/ocaml/sdk-gen/c/autogen/include/xen/api/xen_string_set.h
index 25795c108ec..32b37a29298 100644
--- a/ocaml/sdk-gen/c/autogen/include/xen/api/xen_string_set.h
+++ b/ocaml/sdk-gen/c/autogen/include/xen/api/xen_string_set.h
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/c/autogen/include/xen/api/xen_string_set_set.h b/ocaml/sdk-gen/c/autogen/include/xen/api/xen_string_set_set.h
index 30aafd81640..ebfa1ceb54c 100644
--- a/ocaml/sdk-gen/c/autogen/include/xen/api/xen_string_set_set.h
+++ b/ocaml/sdk-gen/c/autogen/include/xen/api/xen_string_set_set.h
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/c/autogen/src/xen_common.c b/ocaml/sdk-gen/c/autogen/src/xen_common.c
index 64811214095..9081f9bd725 100644
--- a/ocaml/sdk-gen/c/autogen/src/xen_common.c
+++ b/ocaml/sdk-gen/c/autogen/src/xen_common.c
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/c/autogen/src/xen_event_batch.c b/ocaml/sdk-gen/c/autogen/src/xen_event_batch.c
index 51afa39dbb6..1794dc5f001 100644
--- a/ocaml/sdk-gen/c/autogen/src/xen_event_batch.c
+++ b/ocaml/sdk-gen/c/autogen/src/xen_event_batch.c
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/c/autogen/src/xen_int_set.c b/ocaml/sdk-gen/c/autogen/src/xen_int_set.c
index 841be9f2a3c..9f861e8e10f 100644
--- a/ocaml/sdk-gen/c/autogen/src/xen_int_set.c
+++ b/ocaml/sdk-gen/c/autogen/src/xen_int_set.c
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/c/autogen/src/xen_string_set.c b/ocaml/sdk-gen/c/autogen/src/xen_string_set.c
index 988f38437ca..5f821281ee2 100644
--- a/ocaml/sdk-gen/c/autogen/src/xen_string_set.c
+++ b/ocaml/sdk-gen/c/autogen/src/xen_string_set.c
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/c/autogen/src/xen_string_set_set.c b/ocaml/sdk-gen/c/autogen/src/xen_string_set_set.c
index 2eb93086b60..8ac36476867 100644
--- a/ocaml/sdk-gen/c/autogen/src/xen_string_set_set.c
+++ b/ocaml/sdk-gen/c/autogen/src/xen_string_set_set.c
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/c/gen_c_binding.ml b/ocaml/sdk-gen/c/gen_c_binding.ml
index 5e068657510..6d1bf601899 100644
--- a/ocaml/sdk-gen/c/gen_c_binding.ml
+++ b/ocaml/sdk-gen/c/gen_c_binding.ml
@@ -1,31 +1,5 @@
(*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
- *
- * 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.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) Cloud Software Group, Inc.
*)
(* Generator of C bindings from the datamodel *)
diff --git a/ocaml/sdk-gen/c/helper.ml b/ocaml/sdk-gen/c/helper.ml
index 22a59d0aac1..0079b42ef99 100644
--- a/ocaml/sdk-gen/c/helper.ml
+++ b/ocaml/sdk-gen/c/helper.ml
@@ -1,31 +1,5 @@
(*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
- *
- * 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.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) Cloud Software Group, Inc.
*)
let rec formatted_wrap formatter s =
diff --git a/ocaml/sdk-gen/c/templates/Makefile.mustache b/ocaml/sdk-gen/c/templates/Makefile.mustache
index 422f9ac1357..384ffcb174d 100644
--- a/ocaml/sdk-gen/c/templates/Makefile.mustache
+++ b/ocaml/sdk-gen/c/templates/Makefile.mustache
@@ -1,6 +1,5 @@
#
-# Copyright (c) Citrix Systems, Inc.
-# All rights reserved.
+# Copyright (c) Cloud Software Group, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/c/templates/xen_all.h.mustache b/ocaml/sdk-gen/c/templates/xen_all.h.mustache
index e1438d204e5..9d9bef9143e 100644
--- a/ocaml/sdk-gen/c/templates/xen_all.h.mustache
+++ b/ocaml/sdk-gen/c/templates/xen_all.h.mustache
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/c/templates/xen_api_version.c.mustache b/ocaml/sdk-gen/c/templates/xen_api_version.c.mustache
index 19ff0f3fec2..0a13575d334 100644
--- a/ocaml/sdk-gen/c/templates/xen_api_version.c.mustache
+++ b/ocaml/sdk-gen/c/templates/xen_api_version.c.mustache
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/c/templates/xen_api_version.h.mustache b/ocaml/sdk-gen/c/templates/xen_api_version.h.mustache
index 06470b50254..5f55ec79291 100644
--- a/ocaml/sdk-gen/c/templates/xen_api_version.h.mustache
+++ b/ocaml/sdk-gen/c/templates/xen_api_version.h.mustache
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/c/templates/xen_internal.mustache b/ocaml/sdk-gen/c/templates/xen_internal.mustache
index f66d742e5b8..934ae5047e0 100644
--- a/ocaml/sdk-gen/c/templates/xen_internal.mustache
+++ b/ocaml/sdk-gen/c/templates/xen_internal.mustache
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/common/CommonFunctions.ml b/ocaml/sdk-gen/common/CommonFunctions.ml
index c43541c1b42..b5fc62132a8 100644
--- a/ocaml/sdk-gen/common/CommonFunctions.ml
+++ b/ocaml/sdk-gen/common/CommonFunctions.ml
@@ -1,31 +1,5 @@
(*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
- *
- * 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.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) Cloud Software Group, Inc.
*)
open Printf
diff --git a/ocaml/sdk-gen/common/licence.ml b/ocaml/sdk-gen/common/licence.ml
index 9030aafbe2c..22a7226ce32 100644
--- a/ocaml/sdk-gen/common/licence.ml
+++ b/ocaml/sdk-gen/common/licence.ml
@@ -1,37 +1,10 @@
(*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
- *
- * 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.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) Cloud Software Group, Inc.
*)
let bsd_two_clause =
"/*\n\
- \ * Copyright (c) Citrix Systems, Inc.\n\
- \ * All rights reserved.\n\
+ \ * Copyright (c) Cloud Software Group, Inc.\n\
\ *\n\
\ * Redistribution and use in source and binary forms, with or without\n\
\ * modification, are permitted provided that the following conditions\n\
diff --git a/ocaml/sdk-gen/csharp/README-NuGet.dist b/ocaml/sdk-gen/csharp/README-NuGet.dist
index d1ec0bfdbea..4b7c1e61d6b 100644
--- a/ocaml/sdk-gen/csharp/README-NuGet.dist
+++ b/ocaml/sdk-gen/csharp/README-NuGet.dist
@@ -1,6 +1,8 @@
XenServer.NET
=============
+Copyright (c) 2007-2023 Cloud Software Group, Inc. All Rights Reserved.
+
XenServer.NET is a complete SDK for XenServer, exposing the XenServer
API as .NET classes. It is written in C#.
diff --git a/ocaml/sdk-gen/csharp/README.dist b/ocaml/sdk-gen/csharp/README.dist
index 2c49dc356ad..74dd6d57086 100644
--- a/ocaml/sdk-gen/csharp/README.dist
+++ b/ocaml/sdk-gen/csharp/README.dist
@@ -1,6 +1,8 @@
XenServer.NET
=============
+Copyright (c) 2007-2023 Cloud Software Group, Inc. All Rights Reserved.
+
XenServer.NET is a complete SDK for XenServer, exposing the XenServer
API as .NET classes. It is written in C#.
diff --git a/ocaml/sdk-gen/csharp/autogen/src/Converters.cs b/ocaml/sdk-gen/csharp/autogen/src/Converters.cs
index 69836b2aac7..2c4e4ba0df7 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/Converters.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/Converters.cs
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/autogen/src/DeprecatedAttribute.cs b/ocaml/sdk-gen/csharp/autogen/src/DeprecatedAttribute.cs
index 9c854012e2e..4a11790dc8b 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/DeprecatedAttribute.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/DeprecatedAttribute.cs
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/autogen/src/Event.cs b/ocaml/sdk-gen/csharp/autogen/src/Event.cs
index 25794bc541d..62bb7d16ae8 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/Event.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/Event.cs
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/autogen/src/Failure.cs b/ocaml/sdk-gen/csharp/autogen/src/Failure.cs
index 685aa54a9c0..d165fa93947 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/Failure.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/Failure.cs
@@ -1,31 +1,30 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
- *
- * 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.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) Cloud Software Group, Inc.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
diff --git a/ocaml/sdk-gen/csharp/autogen/src/HTTP.cs b/ocaml/sdk-gen/csharp/autogen/src/HTTP.cs
index 3dd388623b9..4e6bf40a3da 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/HTTP.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/HTTP.cs
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/autogen/src/Helper.cs b/ocaml/sdk-gen/csharp/autogen/src/Helper.cs
index 4e7478014dd..2d107df1650 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/Helper.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/Helper.cs
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/autogen/src/IMockWebProxy.cs b/ocaml/sdk-gen/csharp/autogen/src/IMockWebProxy.cs
index dc0615e53d6..a3c82127bd4 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/IMockWebProxy.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/IMockWebProxy.cs
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/autogen/src/IXenObject.cs b/ocaml/sdk-gen/csharp/autogen/src/IXenObject.cs
index 133895d06a2..cec3b572038 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/IXenObject.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/IXenObject.cs
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/autogen/src/JsonRpc.cs b/ocaml/sdk-gen/csharp/autogen/src/JsonRpc.cs
index bbd4ff01139..bc311046861 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/JsonRpc.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/JsonRpc.cs
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/autogen/src/Marshalling.cs b/ocaml/sdk-gen/csharp/autogen/src/Marshalling.cs
index 015534cf848..7a35cb440fe 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/Marshalling.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/Marshalling.cs
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/autogen/src/Response.cs b/ocaml/sdk-gen/csharp/autogen/src/Response.cs
index 42d79f05ed1..a82c60f5888 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/Response.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/Response.cs
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/autogen/src/Session.cs b/ocaml/sdk-gen/csharp/autogen/src/Session.cs
index a016ab58fa5..5994c4f25a5 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/Session.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/Session.cs
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/autogen/src/Subject2.cs b/ocaml/sdk-gen/csharp/autogen/src/Subject2.cs
index a5de37096df..cb86318b5c7 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/Subject2.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/Subject2.cs
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/autogen/src/UserDetails.cs b/ocaml/sdk-gen/csharp/autogen/src/UserDetails.cs
index b4ca1888584..ebf4cf25853 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/UserDetails.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/UserDetails.cs
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/autogen/src/XenObject.cs b/ocaml/sdk-gen/csharp/autogen/src/XenObject.cs
index f5f2fb45e44..3d372799771 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/XenObject.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/XenObject.cs
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/autogen/src/XenRef.cs b/ocaml/sdk-gen/csharp/autogen/src/XenRef.cs
index 7b02f287a6f..d71646a2974 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/XenRef.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/XenRef.cs
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/friendly_error_names.ml b/ocaml/sdk-gen/csharp/friendly_error_names.ml
index cfeb0fb01d7..4fe041a298f 100644
--- a/ocaml/sdk-gen/csharp/friendly_error_names.ml
+++ b/ocaml/sdk-gen/csharp/friendly_error_names.ml
@@ -1,31 +1,5 @@
(*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
- *
- * 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.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) Cloud Software Group, Inc.
*)
open CommonFunctions
diff --git a/ocaml/sdk-gen/csharp/gen_csharp_binding.ml b/ocaml/sdk-gen/csharp/gen_csharp_binding.ml
index 9f19876373b..62812d94e61 100644
--- a/ocaml/sdk-gen/csharp/gen_csharp_binding.ml
+++ b/ocaml/sdk-gen/csharp/gen_csharp_binding.ml
@@ -1,31 +1,5 @@
(*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
- *
- * 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.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) Cloud Software Group, Inc.
*)
open Printf
diff --git a/ocaml/sdk-gen/csharp/templates/ApiVersion.mustache b/ocaml/sdk-gen/csharp/templates/ApiVersion.mustache
index 3dead214115..a8be1e4e8a5 100644
--- a/ocaml/sdk-gen/csharp/templates/ApiVersion.mustache
+++ b/ocaml/sdk-gen/csharp/templates/ApiVersion.mustache
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/templates/Enum.mustache b/ocaml/sdk-gen/csharp/templates/Enum.mustache
index 070d53ba407..2d3ab1d2135 100644
--- a/ocaml/sdk-gen/csharp/templates/Enum.mustache
+++ b/ocaml/sdk-gen/csharp/templates/Enum.mustache
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/templates/JsonRpcClient.mustache b/ocaml/sdk-gen/csharp/templates/JsonRpcClient.mustache
index 4c7cf04d594..ac3d0ca625c 100644
--- a/ocaml/sdk-gen/csharp/templates/JsonRpcClient.mustache
+++ b/ocaml/sdk-gen/csharp/templates/JsonRpcClient.mustache
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/templates/Message2.mustache b/ocaml/sdk-gen/csharp/templates/Message2.mustache
index d670e0fab42..762b2c9931c 100644
--- a/ocaml/sdk-gen/csharp/templates/Message2.mustache
+++ b/ocaml/sdk-gen/csharp/templates/Message2.mustache
@@ -1,6 +1,5 @@
/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
+ * Copyright (c) Cloud Software Group, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/ocaml/sdk-gen/csharp/templates/XenServer.csproj.mustache b/ocaml/sdk-gen/csharp/templates/XenServer.csproj.mustache
index e573b5fa215..4006046d879 100644
--- a/ocaml/sdk-gen/csharp/templates/XenServer.csproj.mustache
+++ b/ocaml/sdk-gen/csharp/templates/XenServer.csproj.mustache
@@ -7,11 +7,11 @@