From 91d8edc74fdcc4c20ded3237c82b038e7637c7f7 Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Thu, 4 Aug 2022 15:28:46 -0400
Subject: [PATCH 1/3] Add missing schema file

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 CHANGELOG.md          | 5 +++++
 manifest.yaml         | 9 +++------
 pluginDefinition.json | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e34e7a..30beb35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to the sample angular app will be documented in this file.
 
+## 2.0.1
+
+- Bugfix: Schema file was not included, preventing installation as a component
+- Bugfix: Manifest build content template was never resolved, so it has been removed.
+
 ## 2.0.0
 
 - Breaking change: The app now uses angular 12, making it compatible with Zowe v2 desktop and incompatible with v1 desktop.
diff --git a/manifest.yaml b/manifest.yaml
index 7cdc219..bdbb30c 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -2,7 +2,7 @@
 name: angular-sample
 id: org.zowe.zlux.sample.angular
 # Without the v
-version: 2.0.0
+version: 2.0.1
 # Human readable component name
 title: Angular Sample
 # Human readable component description
@@ -19,10 +19,7 @@ repository:
   type: git
   url: https://github.com/zowe/sample-angular-app.git
 # we do not specify encoding here because its already tagged ascii
-build:
-  branch: "{{build.branch}}"
-  number: "{{build.number}}"
-  commitHash: "{{build.commitHash}}"
-  timestamp: "{{build.timestamp}}"
 appfwPlugins:
   - path: .
+schemas:
+  configs: trivial-schema.json
diff --git a/pluginDefinition.json b/pluginDefinition.json
index 987f2e9..aa3d92a 100644
--- a/pluginDefinition.json
+++ b/pluginDefinition.json
@@ -1,7 +1,7 @@
 {
   "identifier": "org.zowe.zlux.sample.angular",
   "apiVersion": "2.0.0",
-  "pluginVersion": "2.0.0",
+  "pluginVersion": "2.0.1",
   "pluginType": "application",
   "license": "EPL-2.0",
   "author": "Zowe",

From 3609b6806c8c8602145a1ec31ce14c0bbf7a0a74 Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Thu, 4 Aug 2022 15:39:35 -0400
Subject: [PATCH 2/3] Add missing schema file

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 manifest.yaml               |  2 +-
 schemas/trivial-schema.json | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 schemas/trivial-schema.json

diff --git a/manifest.yaml b/manifest.yaml
index bdbb30c..4e5b780 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -22,4 +22,4 @@ repository:
 appfwPlugins:
   - path: .
 schemas:
-  configs: trivial-schema.json
+  configs: schemas/trivial-schema.json
diff --git a/schemas/trivial-schema.json b/schemas/trivial-schema.json
new file mode 100644
index 0000000..b22e8e4
--- /dev/null
+++ b/schemas/trivial-schema.json
@@ -0,0 +1,21 @@
+{  
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
+  "$id": "https://abcdef.com/schemas/v2/sample-angular",
+  "allOf": [
+    { "$ref": "https://zowe.org/schemas/v2/server-base" },
+    { 
+      "type": "object",
+      "properties": {
+        "components": {
+          "type": "object",
+          "additionalProperties": true,
+          "properties": {  
+            "sample-angular": {
+              "$ref": "https://zowe.org/schemas/v2/server-base#zoweComponent"
+            }
+          }
+        }
+      }
+    }
+  ]
+}

From 9a7098bb2ba9adda5e038139345239335d0a6888 Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Thu, 4 Aug 2022 16:04:08 -0400
Subject: [PATCH 3/3] Update build scripts

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 zssServer/build/build31.sh | 1 +
 zssServer/build/build64.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/zssServer/build/build31.sh b/zssServer/build/build31.sh
index 5bb394d..dfff825 100755
--- a/zssServer/build/build31.sh
+++ b/zssServer/build/build31.sh
@@ -34,6 +34,7 @@ if ! c89 \
    -Wl,dll \
   -I "${ZSS}/h" \
   -I "${COMMON}/h" \
+  -I "${COMMON}/platform/posix" \
   -o "${TARGET}" \
   ../../src/storage.c \
   ../pluginAPI.x
diff --git a/zssServer/build/build64.sh b/zssServer/build/build64.sh
index 2c76853..5843978 100755
--- a/zssServer/build/build64.sh
+++ b/zssServer/build/build64.sh
@@ -34,6 +34,7 @@ if ! c89 \
    -Wl,lp64,dll \
   -I "${ZSS}/h" \
   -I "${COMMON}/h" \
+  -I "${COMMON}/platform/posix" \
   -o "${TARGET}" \
   ../../src/storage.c \
   ../pluginAPI64.x