Minor refactoring

CMakeLists.txt

@@ -312,12 +312,12 @@ endif() # x64 only
 # Output: OpcTestServer_x86.exe or OpcTestServer_x64.exe
 # ============================================================================
 
-set(TESTSVR_SRC_DIR  "${CMAKE_SOURCE_DIR}/Source/Common/TestServer")
+set(TESTSVR_SRC_DIR  "${CMAKE_SOURCE_DIR}/Source/Test/TestServer")
 set(TESTSVR_BIN_DIR  "${CMAKE_CURRENT_BINARY_DIR}/OpcTestServer")
 set(OPC_UTILS_DIR    "${CMAKE_SOURCE_DIR}/Source/Shared/OpcUtilityClasses")
-set(SAMPLE_SVR_DIR   "${CMAKE_SOURCE_DIR}/Source/Common/SampleServerClasses")
-set(SAMPLE_DEV_DIR   "${CMAKE_SOURCE_DIR}/Source/Common/SampleDevice")
-set(SAMPLE_205_DIR   "${CMAKE_SOURCE_DIR}/Source/Common/SampleServer205")
+set(SAMPLE_SVR_DIR   "${CMAKE_SOURCE_DIR}/Source/Shared/SampleServerClasses")
+set(SAMPLE_DEV_DIR   "${CMAKE_SOURCE_DIR}/Source/Shared/SampleDevice")
+set(SAMPLE_205_DIR   "${CMAKE_SOURCE_DIR}/Source/Shared/SampleServer205")
 file(MAKE_DIRECTORY "${TESTSVR_BIN_DIR}")
 
 # Determine platform tag and MIDL environment
@@ -446,7 +446,7 @@ install(FILES "${TESTSVR_SRC_DIR}/OpcTestServer.config.xml"
 # ============================================================================
 
 add_executable(OpcTestClient
-    "${CMAKE_SOURCE_DIR}/Source/Common/TestClient/OpcTestClient.cpp"
+    "${CMAKE_SOURCE_DIR}/Source/Test/TestClient/OpcTestClient.cpp"
 )
 add_dependencies(OpcTestClient opccomn_ps_generate opcproxy_generate)
 

Source/AlarmsAndEvents/ProxyStub/opc_ae.idl

@@ -1,29 +1,31 @@
-//==============================================================================
-// TITLE: opc_ae.idl
-//
-// CONTENTS:
-// 
-// Interface declarations for the OPC Alarms & Event specifications.
-//
-// (c) Copyright 1997-2003 The OPC Foundation
-// ALL RIGHTS RESERVED.
-//
-// DISCLAIMER:
-//  This code is provided by the OPC Foundation solely to assist in 
-//  understanding and use of the appropriate OPC Specification(s) and may be 
-//  used as set forth in the License Grant section of the OPC Specification.
-//  This code is provided as-is and without warranty or support of any sort
-//  and is subject to the Warranty and Liability Disclaimers which appear
-//  in the printed OPC Specification.
-//
-// MODIFICATION LOG:
-//
-// Date       By    Notes
-// ---------- ---   -----
-// 2002/10/02 JL    Updated for Version 1.1.
-// 2003/01/06 RSA   Fixed formatting to comply with coding guidelines.
-// 2004/09/01 RSA   Renamed modules in TYPELIB section to avoid name conflicts.
-//
+/* ========================================================================
+ * Copyright (c) 2002-2026 OPC Foundation. All rights reserved.
+ *
+ * OPC Foundation MIT License 1.00
+ * 
+ * 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.
+ *
+ * The complete license agreement can be found here:
+ * http://opcfoundation.org/License/MIT/1.00/
+ * ======================================================================*/
 
 import "oaidl.idl";
 import "ocidl.idl";

Source/AlarmsAndEvents/ProxyStub/opcae_er.h

@@ -1,28 +1,31 @@
-//==============================================================================
-// TITLE: opcae_er.h
-//
-// CONTENTS:
-// 
-// Defines error codes for the OPC Alarms & Events specification.
-//
-// (c) Copyright 1997-2003 The OPC Foundation
-// ALL RIGHTS RESERVED.
-//
-// DISCLAIMER:
-//  This code is provided by the OPC Foundation solely to assist in 
-//  understanding and use of the appropriate OPC Specification(s) and may be 
-//  used as set forth in the License Grant section of the OPC Specification.
-//  This code is provided as-is and without warranty or support of any sort
-//  and is subject to the Warranty and Liability Disclaimers which appear
-//  in the printed OPC Specification.
-//
-// MODIFICATION LOG:
-//
-// Date       By    Notes
-// ---------- ---   -----
-// 2002/10/02 JL    Updated for Version 1.1.
-// 2003/01/06 RSA   Fixed formatting to comply with coding guidelines.
-//
+/* ========================================================================
+ * Copyright (c) 2002-2026 OPC Foundation. All rights reserved.
+ *
+ * OPC Foundation MIT License 1.00
+ * 
+ * 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.
+ *
+ * The complete license agreement can be found here:
+ * http://opcfoundation.org/License/MIT/1.00/
+ * ======================================================================*/
 
 #ifndef __OPCAE_ER_H
 #define __OPCAE_ER_H

Source/AlarmsAndEvents/ProxyStub/opcae_er.mc

@@ -1,28 +1,31 @@
-;//==============================================================================
-;// TITLE: opcae_er.h
+;// ========================================================================
+;// Copyright (c) 2002-2026 OPC Foundation. All rights reserved.
 ;//
-;// CONTENTS:
-;// 
-;// Defines error codes for the OPC Alarms & Events specification.
+;// OPC Foundation MIT License 1.00
 ;//
-;// (c) Copyright 1997-2003 The OPC Foundation
-;// ALL RIGHTS RESERVED.
+;// 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:
 ;//
-;// DISCLAIMER:
-;//  This code is provided by the OPC Foundation solely to assist in 
-;//  understanding and use of the appropriate OPC Specification(s) and may be 
-;//  used as set forth in the License Grant section of the OPC Specification.
-;//  This code is provided as-is and without warranty or support of any sort
-;//  and is subject to the Warranty and Liability Disclaimers which appear
-;//  in the printed OPC Specification.
-;//
-;// MODIFICATION LOG:
-;//
-;// Date       By    Notes
-;// ---------- ---   -----
-;// 2002/10/02 JL    Updated for Version 1.1.
-;// 2003/01/06 RSA   Fixed formatting to comply with coding guidelines.
+;// 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.
 ;//
+;// The complete license agreement can be found here:
+;// http://opcfoundation.org/License/MIT/1.00/
+;// ========================================================================
 
 MessageIdTypedef=HRESULT
 

Source/AlarmsAndEvents/ProxyStub/opcaedef.h

@@ -1,28 +1,31 @@
-//==============================================================================
-// TITLE: opcaedef.h
-//
-// CONTENTS:
-// 
-// Defines constants for the OPC Alarms & Events specification.
-//
-// (c) Copyright 1997-2003 The OPC Foundation
-// ALL RIGHTS RESERVED.
-//
-// DISCLAIMER:
-//  This code is provided by the OPC Foundation solely to assist in 
-//  understanding and use of the appropriate OPC Specification(s) and may be 
-//  used as set forth in the License Grant section of the OPC Specification.
-//  This code is provided as-is and without warranty or support of any sort
-//  and is subject to the Warranty and Liability Disclaimers which appear
-//  in the printed OPC Specification.
-//
-// MODIFICATION LOG:
-//
-// Date       By    Notes
-// ---------- ---   -----
-// 2002/10/02 JL    Updated for Version 1.1.
-// 2003/01/06 RSA   Fixed formatting to comply with coding guidelines.
-//
+/* ========================================================================
+ * Copyright (c) 2002-2026 OPC Foundation. All rights reserved.
+ *
+ * OPC Foundation MIT License 1.00
+ * 
+ * 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.
+ *
+ * The complete license agreement can be found here:
+ * http://opcfoundation.org/License/MIT/1.00/
+ * ======================================================================*/
 
 #ifndef __OPCAEDEF_H
 #define __OPCAEDEF_H

Source/AlarmsAndEvents/ProxyStub/resource.h

@@ -1,3 +1,32 @@
+/* ========================================================================
+ * Copyright (c) 2002-2026 OPC Foundation. All rights reserved.
+ *
+ * OPC Foundation MIT License 1.00
+ * 
+ * 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.
+ *
+ * The complete license agreement can be found here:
+ * http://opcfoundation.org/License/MIT/1.00/
+ * ======================================================================*/
+
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Used by opc_ae.rc

Source/Batch/ProxyStub/OpcBatchDef.h

@@ -1,29 +1,31 @@
-//==============================================================================
-// TITLE: OpcBatchDef.h
-//
-// CONTENTS:
-// 
-// Defines constants for the Batch specifications.
-//
-// (c) Copyright 2000-2003 The OPC Foundation
-// ALL RIGHTS RESERVED.
-//
-// DISCLAIMER:
-//  This code is provided by the OPC Foundation solely to assist in 
-//  understanding and use of the appropriate OPC Specification(s) and may be 
-//  used as set forth in the License Grant section of the OPC Specification.
-//  This code is provided as-is and without warranty or support of any sort
-//  and is subject to the Warranty and Liability Disclaimers which appear
-//  in the printed OPC Specification.
-//
-// MODIFICATION LOG:
-//
-// Date       By    Notes
-// ---------- ---   -----
-// 2000/01/17 OPC   Created.
-// 2001/01/23 OPC   Added Version 2.0 properties.
-// 2003/01/06 RSA   Updated formatting.
-//
+/* ========================================================================
+ * Copyright (c) 2002-2026 OPC Foundation. All rights reserved.
+ *
+ * OPC Foundation MIT License 1.00
+ * 
+ * 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.
+ *
+ * The complete license agreement can be found here:
+ * http://opcfoundation.org/License/MIT/1.00/
+ * ======================================================================*/
 
 #ifndef __OPCBATCHDEF_H
 #define __OPCBATCHDEF_H

Source/Batch/ProxyStub/OpcBatchError.h

@@ -1,28 +1,31 @@
-//==============================================================================
-// TITLE: OpcBatchError.h
-//
-// CONTENTS:
-// 
-// Defines error codes for the Batch specifications.
-//
-// (c) Copyright 2000-2003 The OPC Foundation
-// ALL RIGHTS RESERVED.
-//
-// DISCLAIMER:
-//  This code is provided by the OPC Foundation solely to assist in 
-//  understanding and use of the appropriate OPC Specification(s) and may be 
-//  used as set forth in the License Grant section of the OPC Specification.
-//  This code is provided as-is and without warranty or support of any sort
-//  and is subject to the Warranty and Liability Disclaimers which appear
-//  in the printed OPC Specification.
-//
-// MODIFICATION LOG:
-//
-// Date       By    Notes
-// ---------- ---   -----
-// 2000/01/17 OPC   Created.
-// 2003/01/06 RSA   Updated formatting. Added messages to proxy/stub resource block.
-//
+/* ========================================================================
+ * Copyright (c) 2002-2026 OPC Foundation. All rights reserved.
+ *
+ * OPC Foundation MIT License 1.00
+ * 
+ * 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.
+ *
+ * The complete license agreement can be found here:
+ * http://opcfoundation.org/License/MIT/1.00/
+ * ======================================================================*/
 
 #ifndef __OPCBATCHERROR_H
 #define __OPCBATCHERROR_H