odpi · mandy-chessell · Jun 12, 2023 · Jun 12, 2023 · Jun 12, 2023 · Jun 12, 2023
@@ -55,8 +55,8 @@ open-metadata-implementation/governance-servers/ @mandy-chessell
 open-metadata-implementation/governance-servers/data-engine-proxy-services/ @cmgrote @popa-raluca
 open-metadata-implementation/governance-servers/open-lineage-services/ @marius-patrascu @popa-raluca
 open-metadata-implementation/platform-services/ @mandy-chessell
-open-metadata-implementation/server-chassis/ @mandy-chessell
-open-metadata-implementation/server-chassis/server-chassis-spring/ @bogdan-sava @lpalashevski
+open-metadata-implementation/platform-chassis/ @mandy-chessell
+open-metadata-implementation/platform-chassis/platform-chassis-spring/ @bogdan-sava @lpalashevski
 open-metadata-implementation/user-interface/ui-chassis/ @bogdan-sava @marius-patrascu
 open-metadata-implementation/view-services/ @davidradl
 

diff --git a/Content-Organization.md b/Content-Organization.md
@@ -114,7 +114,7 @@ The Egeria core repository contains the core Egeria functionality, and is organi
 
   * **[repository-services](open-metadata-implementation/repository-services)** - metadata exchange and federation - aka the Open Metadata Repository Services (OMRS).
 
-  * **[server-chassis](open-metadata-implementation/server-chassis)** - the server chassis provides the server framework for the OMAG Server Platform.
+  * **[platform-chassis](open-metadata-implementation/platform-chassis)** - the platform chassis provides the runtime framework for the OMAG Server Platform.
 
   * **[user-interfaces](open-metadata-implementation/user-interfaces)** - browser based user interfaces.
 

@@ -22,9 +22,9 @@ This page covers the way dependencies are managed in Egeria.
 
 ### Logging dependencies for slf4j
 
-* Any utility, sample, tool - or our server chassis, are 'applications' in that they have an entry point - typically main(). These should include a binding for slf4j. See http://www.slf4j.org/faq.html
+* Any utility, sample, tool - or our OMAG Server Platform, are 'Java applications' in that they have an entry point - typically main(). These should include a binding for slf4j. See http://www.slf4j.org/faq.html
   * We generally use logback (ch.qos.logback:logback-classic for example)
-  * Generally A configuration file should not be provided - default formatting will be used & can be overriden by logback configuration at deployment time.
+  * Generally A configuration file should not be provided - default formatting will be used & can be overridden by logback configuration at deployment time.
 * Test code automatically includes slf4j-simple - a simple logging implementations
 * Other code that forms libraries (most of our code) MUST NOT include a slf4j logging implementation. Otherwise the application loses control of the logging implementation, hidden config files can change behaviour, and a multiple_bindings issue will be raised by slf4j
 

@@ -18,7 +18,7 @@ dependencies {
 
     // Dependencies for the main server assembly - this is modeled on the pom.xml
     // In future we may be able to select by type or label
-    implementation project(':open-metadata-implementation:server-chassis:server-chassis-spring')
+    implementation project(':open-metadata-implementation:platform-chassis:platform-chassis-spring')
     implementation project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:audit-log-connectors:audit-log-console-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:audit-log-connectors:audit-log-event-topic-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:audit-log-connectors:audit-log-file-connector')
@@ -111,7 +111,10 @@ distributions {
         contents {
             into('server') {
                 // Just the chassis - for backward compatibility
-                from { project(':open-metadata-implementation:server-chassis:server-chassis-spring').bootJar }
+                from { project(':open-metadata-implementation:platform-chassis:platform-chassis-spring').bootJar }
+                rename { String fileName ->
+                    fileName.replace("platform-chassis-spring", "server-chassis-spring")
+                }
                 fileMode = 0755
             }
             into('server/lib') {
@@ -150,9 +153,9 @@ distributions {
             }
             into('platform') {
                 // OMAG Server Platform - new name consistent with documentation
-                from { project(':open-metadata-implementation:server-chassis:server-chassis-spring').bootJar }
+                from { project(':open-metadata-implementation:platform-chassis:platform-chassis-spring').bootJar }
                 rename { String fileName ->
-                    fileName.replace("server-chassis-spring", "omag-server-platform")
+                    fileName.replace("platform-chassis-spring", "omag-server-platform")
                 }
                 fileMode = 0755
             }

@@ -70,7 +70,7 @@ OMAG Servers that it is hosting.
 implementation of the metadata exchange and federation capabilities for a metadata
 repository that supports the open metadata standards.
 
-* **[server-chassis](server-chassis)** - the server chassis is the base component for the OMAG Server Platform.
+* **[platform-chassis](platform-chassis)** - the platform chassis is the base component for the OMAG Server Platform.
 It includes the web server that receives the REST API requests for both the OMAG Server Platform
 and the servers that run on it.
 

@@ -57,7 +57,7 @@ public enum DocStoreErrorCode implements ExceptionMessageSet
     INVALID_DIRECTORY(400, "ENCRYPTED-DOC-STORE-400-008 ",
             "Unable to create secure location for storing encryption key.",
             "The system was unable to generate a secure, random directory in which to store the encryption keys.",
-            "Check the path where the OMAG platform is started to ensure there are sufficient permissions to create files and directories. Review the logs for other potential I/O issues."),
+            "Check the path where the OMAG Server Platform is started to ensure there are sufficient permissions to create files and directories. Review the logs for other potential I/O issues."),
     INVALID_FILE(400, "ENCRYPTED-DOC-STORE-400-009 ",
             "Unable to create secure file for storing encryption key.",
             "The system was unable to generate a secure, random file in which to store the encryption keys.",

@@ -87,7 +87,7 @@ Within this `adapter` module, in a package like `...repositoryconnector`, implem
 	1. then implement be the `getEntityDetail()` method that retrieves an entity by its GUID.
 
 Once these minimal starting points are implemented, you should be able to configure the
-[OMAG server chassis](../../../../../server-chassis/server-chassis-spring)
+[OMAG Server Platform](../../../../../platform-chassis/platform-chassis-spring)
 as a proxy to your repository connector by following the instructions in
 [using the admin services](https://egeria-project.org/guides/admin).
 **Important**: this will *not* necessarily be the

@@ -20,9 +20,9 @@ public enum CommonServicesDescription implements Serializable
                                       "Manages the synchronization, retrieval and maintenance of metadata stored in open metadata repositories",
                                       "https://egeria-project.org/services/omrs"),
 
-    ADMIN_OPERATIONAL_SERVICES       (181,
+    ADMINISTRATION_SERVICES         (181,
                                       ComponentDevelopmentStatus.STABLE,
-                                      "OMAG Server Operational Services",
+                                      "Administration Services",
                                       "admin-services",
                                       "Management of services active in an Open Metadata and governance server (OMAG Server)",
                                       "https://egeria-project.org/services/admin-services/overview"),
@@ -52,7 +52,7 @@ public enum CommonServicesDescription implements Serializable
                                       ComponentDevelopmentStatus.STABLE,
                                       "Platform Services",
                                       "platform-services",
-                                      "Provides information about the registered services and connectors available in an OMAG Server Platform.",
+                                      "Provides information about the registered services and connectors available in an OMAG Server Platform along with services to control and query information about the OMAG Servers running on the platform.",
                                       "https://egeria-project.org/services/platform-services/overview"),
 
     OIF_METADATA_MANAGEMENT          (186,
@@ -85,7 +85,7 @@ public static List<CommonServicesDescription> getGovernanceServersDescriptionLis
         List<CommonServicesDescription> serviceDescriptionList = new ArrayList<>();
 
         serviceDescriptionList.add(CommonServicesDescription.REPOSITORY_SERVICES);
-        serviceDescriptionList.add(CommonServicesDescription.ADMIN_OPERATIONAL_SERVICES);
+        serviceDescriptionList.add(CommonServicesDescription.ADMINISTRATION_SERVICES);
         serviceDescriptionList.add(CommonServicesDescription.OCF_METADATA_MANAGEMENT);
         serviceDescriptionList.add(CommonServicesDescription.GAF_METADATA_MANAGEMENT);
         serviceDescriptionList.add(CommonServicesDescription.OPEN_METADATA_SECURITY);

@@ -19,6 +19,7 @@
 @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown=true)
+@Deprecated
 public class OMAGServerServiceStatus implements Serializable
 {
     private static final long    serialVersionUID = 1L;

@@ -17,6 +17,7 @@
 @JsonAutoDetect(getterVisibility = PUBLIC_ONLY, setterVisibility = PUBLIC_ONLY, fieldVisibility = NONE)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@Deprecated
 public enum ServerActiveStatus implements Serializable
 {
     UNKNOWN     (0,   "Unknown",  "The state of the server is unknown.  This is equivalent to a null value"),

@@ -19,6 +19,7 @@
 @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown=true)
+@Deprecated
 public class ServerServicesStatus implements Serializable
 {
     private static final long    serialVersionUID = 1L;

@@ -18,10 +18,10 @@
  */
 class AdminServicesRESTClient
 {
-    private String                          serverPlatformURLRoot;  /* Initialized in constructor */
-    private AdminClientRESTExceptionHandler exceptionHandler = new AdminClientRESTExceptionHandler();
+    private final String                          serverPlatformURLRoot;  /* Initialized in constructor */
+    private final AdminClientRESTExceptionHandler exceptionHandler = new AdminClientRESTExceptionHandler();
 
-    private RESTClientConnector clientConnector;        /* Initialized in constructor */
+    private final RESTClientConnector clientConnector;        /* Initialized in constructor */
 
 
     /**

@@ -18,7 +18,10 @@
 
 /**
  * OMAGServerOperationsClient provides services to start and stop an OMAG Server.
+ * This client is deprecated and will be removed soon.  Use the Platform Services Client to control OMAG Servers
+ * in the OMAG Server Platform.  It supports the same methods.
  */
+@Deprecated
 public class OMAGServerOperationsClient
 {
     protected String adminUserId;              /* Initialized in constructor */

@@ -182,6 +182,7 @@ public Connection getConfigurationStoreConnection() throws OMAGNotAuthorizedExce
      * @throws OMAGInvalidParameterException invalid parameter.
      * @throws OMAGConfigurationErrorException unusual state in the admin server.
      */
+    @Deprecated
     public void setPlatformSecurityConnection(Connection connection) throws OMAGNotAuthorizedException,
                                                                             OMAGInvalidParameterException,
                                                                             OMAGConfigurationErrorException
@@ -214,13 +215,13 @@ public void setPlatformSecurityConnection(Connection connection) throws OMAGNotA
      * Clear the connection object for platform security.  This means there is no platform security set up
      * and there will be no authorization checks within the platform.  All security will have to
      * come from the surrounding deployment environment.
-     *
      * This is the default state.
      *
      * @throws OMAGNotAuthorizedException the supplied userId is not authorized to issue this command.
      * @throws OMAGInvalidParameterException invalid parameter.
      * @throws OMAGConfigurationErrorException unusual state in the admin server.
      */
+    @Deprecated
     public void clearPlatformSecurityConnection() throws OMAGNotAuthorizedException,
                                                          OMAGInvalidParameterException,
                                                          OMAGConfigurationErrorException
@@ -243,6 +244,7 @@ public void clearPlatformSecurityConnection() throws OMAGNotAuthorizedException,
      * @throws OMAGInvalidParameterException invalid parameter.
      * @throws OMAGConfigurationErrorException unusual state in the admin server.
      */
+    @Deprecated
     public Connection getPlatformSecurityConnection() throws OMAGNotAuthorizedException,
                                                                           OMAGInvalidParameterException,
                                                                           OMAGConfigurationErrorException

@@ -10,24 +10,15 @@ dependencies {
     implementation 'org.slf4j:slf4j-api'
     implementation project(':open-metadata-implementation:admin-services:admin-services-api')
     implementation project(':open-metadata-implementation:admin-services:admin-services-registration')
-    implementation project(':open-metadata-implementation:common-services:multi-tenant')
-    implementation project(':open-metadata-implementation:common-services:ffdc-services')
-    implementation project(':open-metadata-implementation:common-services:metadata-security:metadata-security-apis')
-    implementation project(':open-metadata-implementation:common-services:metadata-security:metadata-security-server')
+    implementation project(':open-metadata-implementation:admin-services:admin-services-client')
     implementation project(':open-metadata-implementation:repository-services:repository-services-apis')
-    implementation project(':open-metadata-implementation:adapters:open-connectors:connector-configuration-factory')
     implementation project(':open-metadata-implementation:repository-services:repository-services-implementation')
-    implementation project(':open-metadata-implementation:framework-services:ocf-metadata-management:ocf-metadata-server')
-    implementation project(':open-metadata-implementation:framework-services:oif-metadata-management:oif-metadata-server')
-    implementation project(':open-metadata-implementation:framework-services:gaf-metadata-management:gaf-metadata-server')
-    implementation project(':open-metadata-conformance-suite:open-metadata-conformance-suite-server')
+    implementation project(':open-metadata-implementation:common-services:ffdc-services')
     implementation project(':open-metadata-implementation:governance-servers:integration-daemon-services:integration-daemon-services-registration')
-    implementation project(':open-metadata-implementation:governance-servers:integration-daemon-services:integration-daemon-services-server')
     implementation project(':open-metadata-implementation:governance-servers:engine-host-services:engine-host-services-registration')
-    implementation project(':open-metadata-implementation:governance-servers:engine-host-services:engine-host-services-server')
-    implementation project(':open-metadata-implementation:governance-servers:open-lineage-services:open-lineage-services-server')
-    implementation project(':open-metadata-implementation:governance-servers:data-engine-proxy-services:data-engine-proxy-services-server')
-    implementation project(':open-metadata-implementation:admin-services:admin-services-client')
+    implementation project(':open-metadata-implementation:adapters:open-connectors:connector-configuration-factory')
+    implementation project(':open-metadata-implementation:common-services:metadata-security:metadata-security-apis')
+    implementation project(':open-metadata-implementation:common-services:metadata-security:metadata-security-server')
     compileOnly 'com.fasterxml.jackson.core:jackson-annotations'
     testCompileOnly 'com.fasterxml.jackson.core:jackson-annotations'
     testImplementation 'org.junit.jupiter:junit-jupiter-api'

@@ -28,7 +28,7 @@ public class OMAGConformanceSuiteConfigServices
     static private final int    maxPageSize    = 50;
 
     private static final RESTCallLogger restCallLogger = new RESTCallLogger(LoggerFactory.getLogger(OMAGConformanceSuiteConfigServices.class),
-                                                                            CommonServicesDescription.ADMIN_OPERATIONAL_SERVICES.getServiceName());
+                                                                            CommonServicesDescription.ADMINISTRATION_SERVICES.getServiceName());
 
     private final OMAGServerAdminStoreServices configStore  = new OMAGServerAdminStoreServices();
     private final OMAGServerErrorHandler       errorHandler = new OMAGServerErrorHandler();

@@ -34,7 +34,7 @@
 public class OMAGServerAdminForAccessServices
 {
     private static final RESTCallLogger restCallLogger = new RESTCallLogger(LoggerFactory.getLogger(OMAGServerAdminForAccessServices.class),
-                                                                            CommonServicesDescription.ADMIN_OPERATIONAL_SERVICES.getServiceName());
+                                                                            CommonServicesDescription.ADMINISTRATION_SERVICES.getServiceName());
 
     private static final String      defaultInTopicName = "InTopic";
     private static final String      defaultOutTopicName = "OutTopic";

@@ -35,7 +35,7 @@ public class OMAGServerAdminForEngineServices
     private static final String accessService  = AccessServiceDescription.GOVERNANCE_ENGINE_OMAS.getAccessServiceName();
 
     private static final RESTCallLogger restCallLogger = new RESTCallLogger(LoggerFactory.getLogger(OMAGServerAdminForEngineServices.class),
-                                                                            CommonServicesDescription.ADMIN_OPERATIONAL_SERVICES.getServiceName());
+                                                                            CommonServicesDescription.ADMINISTRATION_SERVICES.getServiceName());
 
 
     private final OMAGServerAdminStoreServices   configStore = new OMAGServerAdminStoreServices();

@@ -25,7 +25,7 @@
 public class OMAGServerAdminForIntegrationGroups
 {
     private static final RESTCallLogger restCallLogger = new RESTCallLogger(LoggerFactory.getLogger(OMAGServerAdminForIntegrationGroups.class),
-                                                                            CommonServicesDescription.ADMIN_OPERATIONAL_SERVICES.getServiceName());
+                                                                            CommonServicesDescription.ADMINISTRATION_SERVICES.getServiceName());
 
 
     private final OMAGServerAdminStoreServices configStore      = new OMAGServerAdminStoreServices();

@@ -28,7 +28,7 @@
 public class OMAGServerAdminForIntegrationServices
 {
     private static final RESTCallLogger restCallLogger = new RESTCallLogger(LoggerFactory.getLogger(OMAGServerAdminForIntegrationServices.class),
-                                                                            CommonServicesDescription.ADMIN_OPERATIONAL_SERVICES.getServiceName());
+                                                                            CommonServicesDescription.ADMINISTRATION_SERVICES.getServiceName());
 
 
     private final OMAGServerAdminStoreServices   configStore = new OMAGServerAdminStoreServices();