odpi · mandy-chessell · Dec 19, 2023 · Dec 19, 2023 · Dec 19, 2023 · Dec 19, 2023
@@ -111,6 +111,7 @@ egeria-lineage-repositories/**
 /SimpleGovernanceCatalog.json
 /*Archive.json
 /BigGlossary*.json
+/*.omarchive
 
 # Ignore report output
 component-id-report.md

diff --git a/CocoComboGUIDMap.json b/CocoComboGUIDMap.json
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ You will also need the [Java 17 SDK installed](https://adoptium.net/).
 Then run the following gradle command from the top-level directory to build the code and run the tests.
 
 ```bash
-./gradlew clean build
+../gradlew clean build
 ```
 
 Once you see the "Build Successful" message, go to the `open-metadata-distributions` directory.

diff --git a/content-packs/CloudInformationModel.omarchive b/content-packs/CloudInformationModel.omarchive
diff --git a/content-packs/CocoBusinessSystemsArchive.json b/content-packs/CocoBusinessSystemsArchive.json
diff --git a/content-packs/CocoBusinessSystemsArchive.omarchive b/content-packs/CocoBusinessSystemsArchive.omarchive
diff --git a/content-packs/CocoClinicalTrialsTemplatesArchive.json b/content-packs/CocoClinicalTrialsTemplatesArchive.json
@@ -1 +1 @@
-{"class":"OpenMetadataArchive","archiveProperties":{"class":"OpenMetadataArchiveProperties","archiveGUID":"74a786b2-d6d7-401d-b8c1-7d798f752c55","archiveName":"Coco Pharmaceuticals Clinical Trials Templates","archiveDescription":"Templates for new assets relating to a clinical trial.","archiveType":"CONTENT_PACK","originatorName":"Egeria Project","originatorLicense":"Apache 2.0","creationDate":1689850096499,"dependsOnArchives":["bce3b0a0-662a-4f87-b8dc-844078a11a6e"]}}
+{"class":"OpenMetadataArchive","archiveProperties":{"class":"OpenMetadataArchiveProperties","archiveGUID":"74a786b2-d6d7-401d-b8c1-7d798f752c55","archiveName":"Coco Pharmaceuticals Clinical Trials Templates","archiveDescription":"Templates for new assets relating to a clinical trial.","archiveType":"CONTENT_PACK","originatorName":"Egeria Project","originatorLicense":"Apache 2.0","creationDate":1701964927588,"dependsOnArchives":["bce3b0a0-662a-4f87-b8dc-844078a11a6e"]}}
diff --git a/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive b/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive
@@ -0,0 +1 @@
+{"class":"OpenMetadataArchive","archiveProperties":{"class":"OpenMetadataArchiveProperties","archiveGUID":"74a786b2-d6d7-401d-b8c1-7d798f752c55","archiveName":"Coco Pharmaceuticals Clinical Trials Templates","archiveDescription":"Templates for new assets relating to a clinical trial.","archiveType":"CONTENT_PACK","originatorName":"Egeria Project","originatorLicense":"Apache 2.0","creationDate":1702387089899,"dependsOnArchives":["bce3b0a0-662a-4f87-b8dc-844078a11a6e"]}}
diff --git a/content-packs/CocoComboArchive.json b/content-packs/CocoComboArchive.json
diff --git a/content-packs/CocoComboArchive.omarchive b/content-packs/CocoComboArchive.omarchive
diff --git a/content-packs/CocoGovernanceEngineDefinitionsArchive.json b/content-packs/CocoGovernanceEngineDefinitionsArchive.json
diff --git a/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive b/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive
@@ -0,0 +1 @@
+{"class":"OpenMetadataArchive","archiveProperties":{"class":"OpenMetadataArchiveProperties","archiveGUID":"9cbd2b33-e80f-4df2-adc6-d859ebff4c34","archiveName":"CocoGovernanceEngineDefinitions","archiveDescription":"Governance Engine for Coco Pharmaceuticals.","archiveType":"CONTENT_PACK","originatorName":"Egeria Project","originatorLicense":"Apache 2.0","creationDate":1702387089986,"dependsOnArchives":["bce3b0a0-662a-4f87-b8dc-844078a11a6e"]},"archiveInstanceStore":{"class":"OpenMetadataArchiveInstanceStore","entities":[{"class":"EntityDetail","headerVersion":1,"type":{"class":"InstanceType","headerVersion":1,"typeDefCategory":"ENTITY_DEF","typeDefGUID":"be650674-790b-487a-a619-0a9002488055","typeDefName":"OpenDiscoveryEngine","typeDefVersion":2},"instanceProvenanceType":"CONTENT_PACK","metadataCollectionId":"9cbd2b33-e80f-4df2-adc6-d859ebff4c34","metadataCollectionName":"CocoGovernanceEngineDefinitions","createdBy":"Egeria Project","createTime":1702387089986,"version":1,"guid":"1a2878f6-35ab-4984-b3c9-953124a22d9a","properties":{"class":"InstanceProperties","headerVersion":1,"instanceProperties":{"name":{"class":"PrimitivePropertyValue","headerVersion":1,"instancePropertyCategory":"PRIMITIVE","typeGUID":"b34a64b9-554a-42b1-8f8a-7d5c2339f9c4","typeName":"string","primitiveDefCategory":"OM_PRIMITIVE_TYPE_STRING","primitiveValue":"AssetQuality Open Discovery Engine"},"description":{"class":"PrimitivePropertyValue","headerVersion":1,"instancePropertyCategory":"PRIMITIVE","typeGUID":"b34a64b9-554a-42b1-8f8a-7d5c2339f9c4","typeName":"string","primitiveDefCategory":"OM_PRIMITIVE_TYPE_STRING","primitiveValue":"Assess the quality of a digital resource identified by the asset in the request."},"qualifiedName":{"class":"PrimitivePropertyValue","headerVersion":1,"instancePropertyCategory":"PRIMITIVE","typeGUID":"b34a64b9-554a-42b1-8f8a-7d5c2339f9c4","typeName":"string","primitiveDefCategory":"OM_PRIMITIVE_TYPE_STRING","primitiveValue":"AssetQuality"}}},"status":"ACTIVE"}]}}
diff --git a/content-packs/CocoGovernanceProgramArchive.json b/content-packs/CocoGovernanceProgramArchive.json
diff --git a/content-packs/CocoGovernanceProgramArchive.omarchive b/content-packs/CocoGovernanceProgramArchive.omarchive
diff --git a/content-packs/CocoOrganizationArchive.json b/content-packs/CocoOrganizationArchive.json
diff --git a/content-packs/CocoOrganizationArchive.omarchive b/content-packs/CocoOrganizationArchive.omarchive
diff --git a/content-packs/CocoSustainabilityArchive.json b/content-packs/CocoSustainabilityArchive.json
diff --git a/content-packs/CocoSustainabilityArchive.omarchive b/content-packs/CocoSustainabilityArchive.omarchive
diff --git a/content-packs/CocoTypesArchive.json b/content-packs/CocoTypesArchive.json
diff --git a/content-packs/CocoTypesArchive.omarchive b/content-packs/CocoTypesArchive.omarchive
@@ -0,0 +1 @@
+{"class":"OpenMetadataArchive","archiveProperties":{"class":"OpenMetadataArchiveProperties","archiveGUID":"50874908-01f1-47e2-83ea-e571109a946e","archiveName":"CocoTypes","archiveDescription":"Specialized types for Coco Pharmaceuticals.","archiveType":"CONTENT_PACK","originatorName":"Egeria Project","originatorLicense":"Apache 2.0","creationDate":1639984840038,"dependsOnArchives":["bce3b0a0-662a-4f87-b8dc-844078a11a6e"]},"archiveTypeStore":{"class":"OpenMetadataArchiveTypeStore","attributeTypeDefs":[{"class":"EnumDef","headerVersion":1,"version":1,"versionName":"1.0","category":"ENUM_DEF","guid":"fdb05618-d0fe-4725-946f-138ba74f6f43","name":"BiopsyScope","description":"Defines scope of the tissue removal for a biopsy.","elementDefs":[{"headerVersion":1,"ordinal":0,"value":"Unclassified","description":"There is no information on the scope of the biopsy."},{"headerVersion":1,"ordinal":1,"value":"Excisional","description":"The biopsy removed all of the suspicious tissue."},{"headerVersion":1,"ordinal":2,"value":"Incisional","description":"The biopsy took a sample of the tissue under examination."},{"headerVersion":1,"ordinal":99,"value":"Other","description":"Another biopsy scope."}],"defaultValue":{"headerVersion":1,"ordinal":0,"value":"Unclassified","description":"There is no information on the scope of the biopsy."}}],"newTypeDefs":[{"class":"EntityDef","headerVersion":1,"guid":"78479770-79ae-4bd8-b0ec-bf5e60c01e66","name":"BiopsyReport","status":"ACTIVE_TYPEDEF","version":1,"versionName":"1.0","category":"ENTITY_DEF","superType":{"headerVersion":1,"guid":"b463827c-c0a0-4cfb-a2b2-ddc63746ded4","name":"Document","status":"ACTIVE_TYPEDEF"},"description":"Results from a patient biopsy.","origin":"50874908-01f1-47e2-83ea-e571109a946e","createdBy":"Egeria Project","createTime":1639984840038,"validInstanceStatusList":["ACTIVE","DELETED"],"initialStatus":"ACTIVE","propertiesDefinition":[{"headerVersion":1,"attributeName":"biopsyScope","attributeType":{"class":"EnumDef","headerVersion":1,"version":1,"versionName":"1.0","category":"ENUM_DEF","guid":"fdb05618-d0fe-4725-946f-138ba74f6f43","name":"BiopsyScope","description":"Defines scope of the tissue removal for a biopsy.","elementDefs":[{"headerVersion":1,"ordinal":0,"value":"Unclassified","description":"There is no information on the scope of the biopsy."},{"headerVersion":1,"ordinal":1,"value":"Excisional","description":"The biopsy removed all of the suspicious tissue."},{"headerVersion":1,"ordinal":2,"value":"Incisional","description":"The biopsy took a sample of the tissue under examination."},{"headerVersion":1,"ordinal":99,"value":"Other","description":"Another biopsy scope."}],"defaultValue":{"headerVersion":1,"ordinal":0,"value":"Unclassified","description":"There is no information on the scope of the biopsy."}},"attributeStatus":"ACTIVE_ATTRIBUTE","attributeDescription":"Is this biopsy excisional (targeted removal) or incisional (sample taken).","valuesMinCount":0,"valuesMaxCount":1,"attributeCardinality":"AT_MOST_ONE","indexable":true,"unique":false},{"headerVersion":1,"attributeName":"biopsyTechniqueType","attributeType":{"class":"PrimitiveDef","headerVersion":1,"version":1,"versionName":"1.0","category":"PRIMITIVE","guid":"b34a64b9-554a-42b1-8f8a-7d5c2339f9c4","name":"string","primitiveDefCategory":"OM_PRIMITIVE_TYPE_STRING"},"attributeStatus":"ACTIVE_ATTRIBUTE","attributeDescription":"How was the biopsy taken?","valuesMinCount":0,"valuesMaxCount":1,"attributeCardinality":"AT_MOST_ONE","indexable":true,"unique":false}]},{"class":"ClassificationDef","headerVersion":1,"guid":"c2fa7555-f366-4869-88f3-897d6f2ec5a4","name":"ReviewedByClinicalTrials","status":"ACTIVE_TYPEDEF","version":1,"versionName":"1.0","category":"CLASSIFICATION_DEF","description":"Declares that a report or data set has been assessed by the clinical trials team.","origin":"50874908-01f1-47e2-83ea-e571109a946e","createdBy":"Egeria Project","createTime":1639984840038,"validInstanceStatusList":["ACTIVE","DELETED"],"initialStatus":"ACTIVE","propertiesDefinition":[{"headerVersion":1,"attributeName":"reviewer","attributeType":{"class":"PrimitiveDef","headerVersion":1,"version":1,"versionName":"1.0","category":"PRIMITIVE","guid":"b34a64b9-554a-42b1-8f8a-7d5c2339f9c4","name":"string","primitiveDefCategory":"OM_PRIMITIVE_TYPE_STRING"},"attributeStatus":"ACTIVE_ATTRIBUTE","attributeDescription":"Person responsible for maintaining this relationship.","valuesMinCount":0,"valuesMaxCount":1,"attributeCardinality":"AT_MOST_ONE","indexable":true,"unique":false},{"headerVersion":1,"attributeName":"reviewerTypeName","attributeType":{"class":"PrimitiveDef","headerVersion":1,"version":1,"versionName":"1.0","category":"PRIMITIVE","guid":"b34a64b9-554a-42b1-8f8a-7d5c2339f9c4","name":"string","primitiveDefCategory":"OM_PRIMITIVE_TYPE_STRING"},"attributeStatus":"ACTIVE_ATTRIBUTE","attributeDescription":"Type of element used to identify the reviewer.","valuesMinCount":0,"valuesMaxCount":1,"attributeCardinality":"AT_MOST_ONE","indexable":true,"unique":false},{"headerVersion":1,"attributeName":"reviewerPropertyName","attributeType":{"class":"PrimitiveDef","headerVersion":1,"version":1,"versionName":"1.0","category":"PRIMITIVE","guid":"b34a64b9-554a-42b1-8f8a-7d5c2339f9c4","name":"string","primitiveDefCategory":"OM_PRIMITIVE_TYPE_STRING"},"attributeStatus":"ACTIVE_ATTRIBUTE","attributeDescription":"Name of property used to identify the reviewer.","valuesMinCount":0,"valuesMaxCount":1,"attributeCardinality":"AT_MOST_ONE","indexable":true,"unique":false},{"headerVersion":1,"attributeName":"notes","attributeType":{"class":"CollectionDef","headerVersion":1,"version":1,"versionName":"1.0","category":"COLLECTION","guid":"005c7c14-ac84-4136-beed-959401b041f8","name":"map<string,string>","description":"A map from String to String.","collectionDefCategory":"OM_COLLECTION_MAP","argumentCount":2,"argumentTypes":["OM_PRIMITIVE_TYPE_STRING","OM_PRIMITIVE_TYPE_STRING"]},"attributeStatus":"ACTIVE_ATTRIBUTE","attributeDescription":"Information for the clinical trials team relating to the review.","valuesMinCount":0,"valuesMaxCount":1,"attributeCardinality":"AT_MOST_ONE","indexable":true,"unique":false}],"validEntityDefs":[{"headerVersion":1,"guid":"896d14c2-7522-4f6c-8519-757711943fe6","name":"Asset","status":"ACTIVE_TYPEDEF"}],"propagatable":false},{"class":"RelationshipDef","headerVersion":1,"guid":"54300f97-0140-4adb-b9a9-308514694f8d","name":"BiopsySupportingEvidence","status":"ACTIVE_TYPEDEF","version":1,"versionName":"1.0","category":"RELATIONSHIP_DEF","description":"Link between a biopsy report and other data sources.","origin":"50874908-01f1-47e2-83ea-e571109a946e","createdBy":"Egeria Project","createTime":1639984840038,"validInstanceStatusList":["ACTIVE","DELETED"],"initialStatus":"ACTIVE","propertiesDefinition":[{"headerVersion":1,"attributeName":"notes","attributeType":{"class":"CollectionDef","headerVersion":1,"version":1,"versionName":"1.0","category":"COLLECTION","guid":"005c7c14-ac84-4136-beed-959401b041f8","name":"map<string,string>","description":"A map from String to String.","collectionDefCategory":"OM_COLLECTION_MAP","argumentCount":2,"argumentTypes":["OM_PRIMITIVE_TYPE_STRING","OM_PRIMITIVE_TYPE_STRING"]},"attributeStatus":"ACTIVE_ATTRIBUTE","attributeDescription":"Information for the clinical trials team relating to the evidence.","valuesMinCount":0,"valuesMaxCount":1,"attributeCardinality":"AT_MOST_ONE","indexable":true,"unique":false}],"propagationRule":"NONE","endDef1":{"headerVersion":1,"entityType":{"headerVersion":1,"guid":"78479770-79ae-4bd8-b0ec-bf5e60c01e66","name":"BiopsyReport","status":"ACTIVE_TYPEDEF"},"attributeName":"report","attributeDescription":"Report that the evidence is being linked to.","attributeCardinality":"ANY_NUMBER"},"endDef2":{"headerVersion":1,"entityType":{"headerVersion":1,"guid":"a32316b8-dc8c-48c5-b12b-71c1b2a080bf","name":"Referenceable","status":"ACTIVE_TYPEDEF"},"attributeName":"evidence","attributeDescription":"Further information to support the report.","attributeCardinality":"ANY_NUMBER"},"multiLink":false}]}}
diff --git a/content-packs/DataStoreConnectorTypes.json b/content-packs/DataStoreConnectorTypes.json
diff --git a/content-packs/OpenConnectorsArchive.omarchive b/content-packs/OpenConnectorsArchive.omarchive
diff --git a/content-packs/OpenMetadataTypes.omarchive b/content-packs/OpenMetadataTypes.omarchive
diff --git a/content-packs/README.md b/content-packs/README.md
@@ -11,60 +11,55 @@ or [while the server is running](https://egeria-project.org/guides/operations/ad
 
 They are as follows:
 
-* **CloudInformationModel.json** - glossary from the **Cloud Information Model**'s
+* **CloudInformationModel.omarchive** - glossary from the **Cloud Information Model**'s
 [JSONLD formatted model](https://raw.githubusercontent.com/cloudinformationmodel/cloudinformationmodel/master/dist/model.jsonld).
 The content covers basic commerce concepts such as Party, Product, Invoice and Shipping.
 The cloud information project has been archived.  However, this is a useful starter set glossary,
 
-The next four archives are built from the [archive writers in egeria-samples.git](https://github.com/odpi/egeria-samples/tree/main/sample-metadata-archives/coco-metadata-archives).
-They supply metadata to support the Coco Pharmaceuticals scenarios.
+The next set of archives supply metadata to support the Coco Pharmaceuticals scenarios.  There is also an archive called `CocoComboArchive` that includes all of the metadata from these archives in a single file.
 
-* **CocoBusinessSystemsArchive** provides a catalog of the business systems and the lineage between
+* **CocoBusinessSystemsArchive.omarchive** provides a catalog of the business systems and the lineage between
   them and the load of their data into the data lake.  This archive simulates the type of metadata expected from
   an ETL tool suite.  It is intended for **cocoMDS5** in the open metadata labs but can be used in any server.
 
-* **Coco Pharmaceuticals Organizations** - provides the profiles, user identifies and team of the featured
+* **CocoOrganizationArchive.omarchive** - provides the profiles, user identifies and team of the featured
   personas of Coco Pharmaceuticals.
 
-* **CocoClinicalTrialsTemplatesArchive** - provides the template assets used for onboarding weekly patient measurements during a clinical trial.
+* **CocoClinicalTrialsTemplatesArchive.omarchive** - provides the template assets used for onboarding weekly patient measurements during a clinical trial.
 
-* **Governance Program Definitions** - provides the metadata to describe Coco Pharmaceuticals governance program.
+* **GovernanceProgramArchive.omarchive** - provides the metadata to describe Coco Pharmaceuticals governance program.
 
-* **CocoGovernanceEngineDefinitionsArchive** - provides the metadata to describe Coco Pharmaceuticals three governance engines:
-  `AssetGovernance`, `AssetDiscovery` and `AssetQuality`.
+* **CocoGovernanceEngineDefinitionsArchive.omarchive** - provides the metadata to describe Coco Pharmaceuticals quality governance engine: `AssetQuality`.
 
-* **Coco Pharmaceuticals Sustainability Initiative** provides the base definitions for Coco Pharmaceutical's
+* **CocoSustainabilityArchive.omarchive** provides the base definitions for Coco Pharmaceutical's
   sustainability initiative.
 
-* **CocoTypesArchive** - provides additional types for Coco Pharmaceuticals.  These are `BiopsyScope` Enum, `BiopsyReport` Entity, `BiopsySupportingEvidence` Relationship and
+* **CocoTypesArchive.omarchive** - provides additional types for Coco Pharmaceuticals.  These are `BiopsyScope` Enum, `BiopsyReport` Entity, `BiopsySupportingEvidence` Relationship and
   `ReviewedByClinicalTrials` Classification.
 
-These next archives contain connector type and connector category definitions.
+This next archive contains connector type and connector category definitions for the connectors supplied by Egeria.
 
-* **DataStoreConnectorTypes** - A subset of the *OpenConnectorsArchive* retained in case anyone is using it. 
-  It should be considered deprecated and the OpenConnectorsArchive used instead.
+* **OpenConnectorsArchive.omarchive** - Connector type metadata for connecting to data sources and other third party technology.
 
-* **OpenConnectorsArchive** - Connector type metadata for connecting to data sources and other third party technology.
-
-This archive is a summary of all the open metadata type definitions provided by Egeria.  It is supplied for
+The next archive is a summary of all the open metadata type definitions provided by Egeria.  It is supplied for
 external utilities since each OMAG server capable of being a cohort member will load these types on start up.
 
-* **OpenMetadataTypes** - Archive of the open metadata types defined by Egeria.
+* **OpenMetadataTypes.omarchive** - Archive of the open metadata types defined by Egeria.
 
 This final four archives are for a demo showing 4 metadata access servers connected together in a single cohort.
 The archives are each loaded into a different server.  
 It is then possible to show how the cohort integrates metadata from different catalogs.
 These archives are used in the *Development labs* which are part of the [Open Metadata Labs](https://egeria-project.org/education/open-metadata-labs/overview/).
 
-* **SimpleAPICatalog** - API metadata typically found in an API catalog.
+* **SimpleAPICatalog.omarchive** - API metadata typically found in an API catalog.
 
-* **SimpleDataCatalog** - Data Source metadata typically found in an Data catalog.
+* **SimpleDataCatalog.omarchive** - Data Source metadata typically found in an Data catalog.
 
-* **SimpleEventCatalog** - Event metadata typically found in an API catalog.
+* **SimpleEventCatalog.omarchive** - Event metadata typically found in an API catalog.
 
-* **SimpleGovernanceCatalog** - A glossary term linked to metadata elements in the API, Event, Data catalogs.
+* **SimpleGovernanceCatalog.omarchive** - A glossary term linked to metadata elements in the API, Event, Data catalogs.
 
-There is also **SimpleCatalog** that rolls up the content of the four catalogs into a single content pack for use in other scenarios.
+There is also **SimpleCatalog.omarchive** that rolls up the content of the four catalogs into a single content pack for use in other scenarios.
 
 ----
 License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/),

diff --git a/content-packs/SimpleAPICatalog.omarchive b/content-packs/SimpleAPICatalog.omarchive
diff --git a/content-packs/SimpleCatalog.omarchive b/content-packs/SimpleCatalog.omarchive
diff --git a/content-packs/SimpleDataCatalog.omarchive b/content-packs/SimpleDataCatalog.omarchive
diff --git a/content-packs/SimpleEventCatalog.omarchive b/content-packs/SimpleEventCatalog.omarchive
diff --git a/content-packs/SimpleGovernanceCatalog.omarchive b/content-packs/SimpleGovernanceCatalog.omarchive
diff --git a/logback.xml b/logback.xml
@@ -11,7 +11,7 @@
     <!-- It should be installed for each platform where this server is running.                              -->
     <!-- If more servers are added to the platform then duplicate the appenders and loggers for each server. -->
     <property name="LOG_DIR_PLATFORM" value="./data/platform/logs" />
-    <property name="EGERIA_SERVER_1" value="cocoMDS1" />
+    <property name="EGERIA_SERVER_1" value="active-metadata-server" />
     <property name="LOG_DIR_SERVER_1" value="./data/servers/${EGERIA_SERVER_1}/logs" />
 
     <!-- This appender defines the destination of developer (debug) logging. -->