Merge pull request #92 from zowe/bugfix/v2/schema

Add missing schema file

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.

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: schemas/trivial-schema.json

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",

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"
+            }
+          }
+        }
+      }
+    }
+  ]
+}

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

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