Merge pull request #8250 from mandy-chessell/oak2024

Add new processing directories to distribution

.github/workflows/merge-v5.yml

@@ -88,8 +88,10 @@ jobs:
       - name: Copy the distribution content to be used in docker copy command
         run: |
           cp -f container.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties
-          mkdir -p ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-5.0-distribution.tar.gz/assembly/platform/data/servers
+          mkdir -p ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/data/servers
           cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/sample-configs/*-* ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/data/servers
+          cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/sample-data ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform
+          cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/coco-pharmaceuticals ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform
       - name: Build and push(egeria) to quay.io and docker.io (tag latest only for main!)
         if: ${{ github.ref == 'refs/heads/main'}}
         uses: docker/build-push-action@v5

.github/workflows/release-v5.yml

@@ -70,8 +70,10 @@ jobs:
       - name: Copy the distribution content to be used in docker copy command
         run: |
           cp -f container.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties
-          mkdir -p ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-5.0-distribution.tar.gz/assembly/platform/data/servers
+          mkdir -p ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/data/servers
           cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/sample-configs/*-* ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/data/servers
+          cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/sample-data ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform
+          cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/coco-pharmaceuticals ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform
       - name: Build and push(egeria-platform) to quay.io and docker.io
         uses: docker/build-push-action@v5
         with:

open-metadata-distribution/omag-server-platform/README.md

@@ -7,12 +7,14 @@ The **OMAG Server Platform** module creates a distribution **tar** file that can
 and used to install Egeria's OMAG Server Platform.   For further information see
 [Installing Egeria Tutorial](https://egeria-project.org/education/tutorials/installing-egeria-tutorial).
 
-The diagram below shows the file layout for the OMAG Server Platform. The directories show in white are built by this assembly.  The ones shown in blue are created during the platform operation.
+The diagram below shows the file layout for the OMAG Server Platform runtime environment. The directories shown in white are built by this assembly.  The ones shown in blue are created during the platform operation.
 
-![File layout for the omag-server-platform assembly](docs/fileLayout.png)
+![File layout for the omag-server-platform assembly](docs/fileLayout-omag-server-platform.png)
 
 Each of the directories created by the assembly includes a `README.md` file that describes its content and how to use it.
 
+In addition, the [Getting started with Egeria](https://getting-started-with-egeria.pdr-associates.com/introduction.html) blogs show how to make use of this assembly.
+
 ----
 License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/),
 Copyright Contributors to the ODPi Egeria project.

open-metadata-distribution/omag-server-platform/build.gradle

@@ -130,7 +130,8 @@ distributions {
                 }
                 fileMode = 0755
             }
-            into('assembly') {
+            into('assembly/platform') {
+                // Ensure license and notice are included in the docker container
                 from(rootProject.projectDir) {
                     include 'NOTICE'
                     include 'LICENSE'
@@ -217,13 +218,24 @@ distributions {
                 from { project(':open-metadata-implementation:adapters:open-connectors:system-connectors:apache-kafka-connectors').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:system-connectors:egeria-system-connectors').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:data-manager-connectors:postgres-server-connectors').shadowJar }
+                from { project(':open-metadata-implementation:adapters:open-connectors:data-manager-connectors:unity-catalog-connectors').jar }
                 fileMode = 0755
             }
             into('assembly/platform/extra') {
                 // Identify how to add new libs
                 from { "$rootProject.projectDir/open-metadata-distribution/omag-server-platform/docs/extra" }
                 fileMode = 0755
             }
+            into('assembly/platform/landing-area') {
+                // Identify how to add new libs
+                from { "$rootProject.projectDir/open-metadata-distribution/omag-server-platform/docs/landing-area" }
+                fileMode = 0666
+            }
+            into('assembly/opt/coco-pharmaceuticals') {
+                // Identify how to add new libs
+                from { "$rootProject.projectDir/open-metadata-distribution/omag-server-platform/docs/coco-pharmaceuticals" }
+                fileMode = 0666
+            }
             into('assembly/etc') {
                 // Describe the deployment layout
                 from { "$rootProject.projectDir/open-metadata-distribution/omag-server-platform/docs/etc" }
@@ -272,16 +284,13 @@ distributions {
             }
             into('assembly/opt') {
                 from(rootProject.projectDir) {
-                    include 'content-packs/*'
                     include 'sample-data/*/*'
                 }
                 fileMode = 0755
             }
             into('assembly/platform') {
                 from(rootProject.projectDir) {
-                    include 'content-packs/CoreContentPack.omarchive'
-                    include 'content-packs/SimpleCatalog.omarchive'
-                    include 'content-packs/CocoComboArchive.omarchive'
+                    include 'content-packs/*'
                 }
                 fileMode = 0755
             }

open-metadata-distribution/omag-server-platform/docs/coco-pharmaceuticals/README.md

@@ -0,0 +1,13 @@
+<!-- SPDX-License-Identifier: CC-BY-4.0 -->
+<!-- Copyright Contributors to the Egeria project. -->
+
+# Coco Pharmaceuticals
+
+Files added under this directory (or subdirectories) are managed as part of the
+[Coco Pharmaceuticals scenarios](https://egeria-project.org/practices/coco-pharmaceuticals/) that are used to illustrate particular features of Egeria.  
+
+The metadata that supports these scenarios is located in the *CocoComboArchive.omarchive*,
+and is made available when this archive is loaded.
+
+
+